diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
index 350dda5..d863960 100644
--- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
+++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
@@ -1,7 +1,7 @@
-From 5d89c5d4528ff7a271090f1fcbfa836cda85d2bf Mon Sep 17 00:00:00 2001
+From 3092553e69dcf3976fe329939cc56fb2e9e2a4cc Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 13 Jan 2022 14:22:24 +0000
-Subject: [PATCH 01/21] Add SPenPointerOverlay
+Subject: [PATCH 01/19] Add SPenPointerOverlay
 
 Toggle this overlay with property "persist.ui.spen.pointer"
 
diff --git a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
similarity index 94%
rename from patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch
rename to patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
index 9606458..9010d1b 100644
--- a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch
+++ b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
@@ -1,7 +1,7 @@
-From c88dfffaa49ca9781cc1bec87ff319b956fbe320 Mon Sep 17 00:00:00 2001
+From 6b598113408b5e7f8fc425efd86779e96c0d7e69 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Apr 2018 10:01:19 +0800
-Subject: [PATCH 03/21] Disable vendor mismatch warning
+Subject: [PATCH 02/19] Disable vendor mismatch warning
 
 Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
 ---
diff --git a/patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch b/patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch
deleted file mode 100644
index c56d00c..0000000
--- a/patches_platform/frameworks_base/0002-UI-Monet-Default-to-Lineage-Teal.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-From e7f6397daa3b9761756e5fef41a32b7401541192 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Mon, 14 Mar 2022 08:20:43 +0000
-Subject: [PATCH 02/21] UI: Monet: Default to Lineage Teal
-
-Embrace Monet, but also maintain some LOS identity
-Applies the signature teal of LineageOS (#167C80) as fallback (e.g. with live wallpapers)
-
-Change-Id: Ida88fa1d891223ad11e058d24b3c96bebbc9cd62
----
- core/res/res/values/colors.xml                | 120 +++++++++---------
- .../com/android/systemui/monet/ColorScheme.kt |  14 +-
- 2 files changed, 67 insertions(+), 67 deletions(-)
-
-diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
-index 59d6005ba193..36cf03f5268e 100644
---- a/core/res/res/values/colors.xml
-+++ b/core/res/res/values/colors.xml
-@@ -245,200 +245,200 @@
- 
-     <!-- Lightest shade of the accent color used by the system. White.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_0">#ffffff</color>
-+    <color name="system_accent1_0">#FFFFFF</color>
-     <!-- Shade of the accent system color at 99% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_10">#F9FCFF</color>
-+    <color name="system_accent1_10">#EFFFFF</color>
-     <!-- Shade of the accent system color at 95% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_50">#E0F3FF</color>
-+    <color name="system_accent1_50">#B4FDFF</color>
-     <!-- Shade of the accent system color at 90% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_100">#C1E8FF</color>
-+    <color name="system_accent1_100">#6EF6FC</color>
-     <!-- Shade of the accent system color at 80% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_200">#76D1FF</color>
-+    <color name="system_accent1_200">#4CD9E0</color>
-     <!-- Shade of the accent system color at 70% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_300">#4BB6E8</color>
-+    <color name="system_accent1_300">#1EBDC4</color>
-     <!-- Shade of the accent system color at 60% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_400">#219BCC</color>
-+    <color name="system_accent1_400">#00A1A7</color>
-     <!-- Shade of the accent system color at 49.6% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_500">#007FAC</color>
-+    <color name="system_accent1_500">#008388</color>
-     <!-- Shade of the accent system color at 40% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_600">#00668B</color>
-+    <color name="system_accent1_600">#00696E</color>
-     <!-- Shade of the accent system color at 30% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_700">#004C69</color>
-+    <color name="system_accent1_700">#004F53</color>
-     <!-- Shade of the accent system color at 20% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_800">#003549</color>
-+    <color name="system_accent1_800">#00373A</color>
-     <!-- Shade of the accent system color at 10% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent1_900">#001E2C</color>
-+    <color name="system_accent1_900">#002022</color>
-     <!-- Darkest shade of the accent color used by the system. Black.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
-     <color name="system_accent1_1000">#000000</color>
- 
-     <!-- Lightest shade of the secondary accent color used by the system. White.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_0">#ffffff</color>
-+    <color name="system_accent2_0">#FFFFFF</color>
-     <!-- Shade of the secondary accent system color at 99% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_10">#F9FCFF</color>
-+    <color name="system_accent2_10">#EFFFFF</color>
-     <!-- Shade of the secondary accent system color at 95% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_50">#E0F3FF</color>
-+    <color name="system_accent2_50">#DAF6F7</color>
-     <!-- Shade of the secondary accent system color at 90% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_100">#D1E5F4</color>
-+    <color name="system_accent2_100">#CCE8E8</color>
-     <!-- Shade of the secondary accent system color at 80% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_200">#B5CAD7</color>
-+    <color name="system_accent2_200">#B0CCCC</color>
-     <!-- Shade of the secondary accent system color at 70% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_300">#9AAEBB</color>
-+    <color name="system_accent2_300">#96B0B1</color>
-     <!-- Shade of the secondary accent system color at 60% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_400">#8094A0</color>
-+    <color name="system_accent2_400">#7B9697</color>
-     <!-- Shade of the secondary accent system color at 49.6% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_500">#657985</color>
-+    <color name="system_accent2_500">#617B7C</color>
-     <!-- Shade of the secondary accent system color at 40% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_600">#4E616C</color>
-+    <color name="system_accent2_600">#496364</color>
-     <!-- Shade of the secondary accent system color at 30% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_700">#374955</color>
-+    <color name="system_accent2_700">#324B4D</color>
-     <!-- Shade of the secondary accent system color at 20% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_800">#20333D</color>
-+    <color name="system_accent2_800">#1B3436</color>
-     <!-- Shade of the secondary accent system color at 10% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent2_900">#091E28</color>
-+    <color name="system_accent2_900">#051F21</color>
-     <!-- Darkest shade of the secondary accent color used by the system. Black.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
-     <color name="system_accent2_1000">#000000</color>
- 
-     <!-- Lightest shade of the tertiary accent color used by the system. White.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_0">#ffffff</color>
-+    <color name="system_accent3_0">#FFFFFF</color>
-     <!-- Shade of the tertiary accent system color at 99% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_10">#FFFBFF</color>
-+    <color name="system_accent3_10">#FDFCFF</color>
-     <!-- Shade of the tertiary accent system color at 95% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_50">#F5EEFF</color>
-+    <color name="system_accent3_50">#EBF1FF</color>
-     <!-- Shade of the tertiary accent system color at 90% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_100">#E6DEFF</color>
-+    <color name="system_accent3_100">#D4E3FF</color>
-     <!-- Shade of the tertiary accent system color at 80% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_200">#CAC1EA</color>
-+    <color name="system_accent3_200">#ACC8F7</color>
-     <!-- Shade of the tertiary accent system color at 70% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_300">#AEA6CE</color>
-+    <color name="system_accent3_300">#91ACDB</color>
-     <!-- Shade of the tertiary accent system color at 60% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_400">#938CB1</color>
-+    <color name="system_accent3_400">#7692BE</color>
-     <!-- Shade of the tertiary accent system color at 49% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_500">#787296</color>
-+    <color name="system_accent3_500">#5C77A2</color>
-     <!-- Shade of the tertiary accent system color at 40% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_600">#605A7C</color>
-+    <color name="system_accent3_600">#445F8A</color>
-     <!-- Shade of the tertiary accent system color at 30% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_700">#484264</color>
-+    <color name="system_accent3_700">#2B4770</color>
-     <!-- Shade of the tertiary accent system color at 20% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_800">#322C4C</color>
-+    <color name="system_accent3_800">#113158</color>
-     <!-- Shade of the tertiary accent system color at 10% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_accent3_900">#1D1736</color>
-+    <color name="system_accent3_900">#001B3D</color>
-     <!-- Darkest shade of the tertiary accent color used by the system. Black.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
-     <color name="system_accent3_1000">#000000</color>
- 
-     <!-- Lightest shade of the neutral color used by the system. White.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_0">#ffffff</color>
-+    <color name="system_neutral1_0">#FFFFFF</color>
-     <!-- Shade of the neutral system color at 99% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_10">#FCFCFF</color>
-+    <color name="system_neutral1_10">#FAFDFC</color>
-     <!-- Shade of the neutral system color at 95% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_50">#F0F0F3</color>
-+    <color name="system_neutral1_50">#EFF1F1</color>
-     <!-- Shade of the neutral system color at 90% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_100">#E1E3E5</color>
-+    <color name="system_neutral1_100">#E0E3E2</color>
-     <!-- Shade of the neutral system color at 80% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_200">#C5C7C9</color>
-+    <color name="system_neutral1_200">#C4C7C6</color>
-     <!-- Shade of the neutral system color at 70% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_300">#AAABAE</color>
-+    <color name="system_neutral1_300">#A9ACAB</color>
-     <!-- Shade of the neutral system color at 60% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_400">#8F9193</color>
-+    <color name="system_neutral1_400">#8E9191</color>
-     <!-- Shade of the neutral system color at 49% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_500">#747679</color>
-+    <color name="system_neutral1_500">#737776</color>
-     <!-- Shade of the neutral system color at 40% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_600">#5C5F61</color>
-+    <color name="system_neutral1_600">#5B5F5F</color>
-     <!-- Shade of the neutral system color at 30% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_700">#454749</color>
-+    <color name="system_neutral1_700">#444747</color>
-     <!-- Shade of the neutral system color at 20% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_800">#2E3133</color>
-+    <color name="system_neutral1_800">#2E3131</color>
-     <!-- Shade of the neutral system color at 10% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral1_900">#191C1E</color>
-+    <color name="system_neutral1_900">#191C1C</color>
-     <!-- Darkest shade of the neutral color used by the system. Black.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
-     <color name="system_neutral1_1000">#000000</color>
- 
-     <!-- Lightest shade of the secondary neutral color used by the system. White.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_0">#ffffff</color>
-+    <color name="system_neutral2_0">#FFFFFF</color>
-     <!-- Shade of the secondary neutral system color at 99% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_10">#F9FCFF</color>
-+    <color name="system_neutral2_10">#F4FEFE</color>
-     <!-- Shade of the secondary neutral system color at 95% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_50">#EBF1F8</color>
-+    <color name="system_neutral2_50">#E8F3F2</color>
-     <!-- Shade of the secondary neutral system color at 90% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_100">#DCE3E9</color>
-+    <color name="system_neutral2_100">#DAE5E4</color>
-     <!-- Shade of the secondary neutral system color at 80% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_200">#C0C7CD</color>
-+    <color name="system_neutral2_200">#BEC8C9</color>
-     <!-- Shade of the secondary neutral system color at 70% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_300">#A5ACB2</color>
-+    <color name="system_neutral2_300">#A3ADAE</color>
-     <!-- Shade of the secondary neutral system color at 60% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_400">#8A9297</color>
-+    <color name="system_neutral2_400">#889393</color>
-     <!-- Shade of the secondary neutral system color at 49% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_500">#70777C</color>
-+    <color name="system_neutral2_500">#6E7878</color>
-     <!-- Shade of the secondary neutral system color at 40% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_600">#585F65</color>
-+    <color name="system_neutral2_600">#566061</color>
-     <!-- Shade of the secondary neutral system color at 30% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_700">#40484D</color>
-+    <color name="system_neutral2_700">#3F4949</color>
-     <!-- Shade of the secondary neutral system color at 20% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_800">#2A3136</color>
-+    <color name="system_neutral2_800">#293232</color>
-     <!-- Shade of the secondary neutral system color at 10% perceptual luminance (L* in L*a*b* color space).
-      This value can be overlaid at runtime by OverlayManager RROs. -->
--    <color name="system_neutral2_900">#161C20</color>
-+    <color name="system_neutral2_900">#141D1E</color>
-     <!-- Darkest shade of the secondary neutral color used by the system. Black.
-      This value can be overlaid at runtime by OverlayManager RROs. -->
-     <color name="system_neutral2_1000">#000000</color>
-diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
-index 0b3eccfd3a91..eabc1c510ecb 100644
---- a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
-+++ b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt
-@@ -35,7 +35,7 @@ const val ACCENT3_HUE_SHIFT = 60.0f
- const val NEUTRAL1_CHROMA = 4.0f
- const val NEUTRAL2_CHROMA = 8.0f
- 
--const val GOOGLE_BLUE = 0xFF1b6ef3.toInt()
-+const val LINEAGE_TEAL = 0xFF167C80.toInt()
- 
- const val MIN_CHROMA = 5
- 
-@@ -76,9 +76,9 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) {
-     init {
-         val proposedSeedCam = Cam.fromInt(seed)
-         val seedArgb = if (seed == Color.TRANSPARENT) {
--            GOOGLE_BLUE
-+            LINEAGE_TEAL
-         } else if (proposedSeedCam.chroma < 5) {
--            GOOGLE_BLUE
-+            LINEAGE_TEAL
-         } else {
-             seed
-         }
-@@ -140,7 +140,7 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) {
-                 }.toList()
- 
-                 if (distinctColors.isEmpty()) {
--                    return listOf(GOOGLE_BLUE)
-+                    return listOf(LINEAGE_TEAL)
-                 }
-                 return distinctColors
-             }
-@@ -204,8 +204,8 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) {
-             }
- 
-             if (seeds.isEmpty()) {
--                // Use gBlue 500 if there are 0 colors
--                seeds.add(GOOGLE_BLUE)
-+                // Use Lineage Teal 500 if there are 0 colors
-+                seeds.add(LINEAGE_TEAL)
-             }
- 
-             return seeds
-@@ -259,4 +259,4 @@ public class ColorScheme(@ColorInt seed: Int, val darkTheme: Boolean) {
-             return huePopulation
-         }
-     }
--}
-\ No newline at end of file
-+}
--- 
-2.25.1
-
diff --git a/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch
similarity index 95%
rename from patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch
rename to patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch
index 05f4aa0..75502d5 100644
--- a/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch
+++ b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch
@@ -1,7 +1,7 @@
-From 25f408530b37ae70f3699a8ae88115c457b6275f Mon Sep 17 00:00:00 2001
+From ba083752bf0310ee14884e4a2fe3e3e5846c62b5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 16 Oct 2021 02:23:48 +0000
-Subject: [PATCH 04/21] UI: Adjust default navbar layouts
+Subject: [PATCH 03/19] UI: Adjust default navbar layouts
 
 - Slightly tighten nodpi layout
 - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify
diff --git a/patches_platform/frameworks_base/0005-UI-Disable-left-seascape-navigation-bar-optionally.patch b/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch
similarity index 95%
rename from patches_platform/frameworks_base/0005-UI-Disable-left-seascape-navigation-bar-optionally.patch
rename to patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch
index 88ec611..5ab70b5 100644
--- a/patches_platform/frameworks_base/0005-UI-Disable-left-seascape-navigation-bar-optionally.patch
+++ b/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch
@@ -1,7 +1,7 @@
-From ea79f27d909514d39bdf056bafa57ba38d69e0f8 Mon Sep 17 00:00:00 2001
+From d461abc9968ac7937e5530efd15d46671565c316 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 9 Mar 2018 15:41:26 +0800
-Subject: [PATCH 05/21] UI: Disable left (seascape) navigation bar optionally
+Subject: [PATCH 04/19] UI: Disable left (seascape) navigation bar optionally
 
 Toggle this behaviour with property "persist.ui.seascape.disable"
 
diff --git a/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch
similarity index 89%
rename from patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch
rename to patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch
index de9fde1..599edc4 100644
--- a/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch
+++ b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch
@@ -1,7 +1,7 @@
-From 5f43af1daea3fc2cc9d9b3368830bed714ab2633 Mon Sep 17 00:00:00 2001
+From a996ded413ad03db5074c8cf32858e478d196fc7 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 10 Jan 2021 11:44:29 +0000
-Subject: [PATCH 06/21] UI: Disable wallpaper zoom
+Subject: [PATCH 05/19] UI: Disable wallpaper zoom
 
 It does little more than inducing motion sickness
 
diff --git a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch
similarity index 87%
rename from patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch
rename to patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch
index 0fb843e..88682fd 100644
--- a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch
+++ b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch
@@ -1,7 +1,7 @@
-From 1767820053fc9f52bd8409fb6aa1c56f2f790710 Mon Sep 17 00:00:00 2001
+From 972bc4938064c391290503d7fbeb200e339fe326 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 3 Jun 2020 01:31:34 +0000
-Subject: [PATCH 07/21] UI: Increase default status bar height
+Subject: [PATCH 06/19] UI: Increase default status bar height
 
 Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
 ---
diff --git a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
similarity index 93%
rename from patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
rename to patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
index 14e7e08..961910f 100644
--- a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
+++ b/patches_platform/frameworks_base/0007-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
@@ -1,7 +1,7 @@
-From f947d96463246f92ed606028dd1e4b4941769b7b Mon Sep 17 00:00:00 2001
+From e31ba474b5b86eefe07fdd630c761fc035a0e05f Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 19 Mar 2022 09:22:24 +0000
-Subject: [PATCH 08/21] UI: Restore split-screen divider to pre-Sv2 looks
+Subject: [PATCH 07/19] UI: Restore split-screen divider to pre-Sv2 looks
 
 - Kill rounded corners - where two rectangles collide should be perfectly straight
 - Make it black again - taskbar should mind its own business
diff --git a/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
similarity index 95%
rename from patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
rename to patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
index b799bb9..585d150 100644
--- a/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
+++ b/patches_platform/frameworks_base/0008-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
@@ -1,7 +1,7 @@
-From 359469b002fb3eb561ebebeacf879d644d920ba0 Mon Sep 17 00:00:00 2001
+From bb47f4b8d64a57c3eb5dae7a13c3abdac8533736 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 6 Oct 2020 01:41:16 +0000
-Subject: [PATCH 09/21] UI: Revive navbar layout tuning via sysui_nav_bar
+Subject: [PATCH 08/19] UI: Revive navbar layout tuning via sysui_nav_bar
  tunable
 
 Google keeps fixing what ain't broken.
diff --git a/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
similarity index 96%
rename from patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
rename to patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
index 77eb3fc..3ecad29 100644
--- a/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
+++ b/patches_platform/frameworks_base/0009-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
@@ -1,7 +1,7 @@
-From 820961bea92232ff501ebaa8e9a0208b837d9fbc Mon Sep 17 00:00:00 2001
+From 30cb3ac5413b13486cf8a4035aaf58f302f6c922 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 26 Apr 2020 08:56:13 +0000
-Subject: [PATCH 10/21] UI: Use SNAP_FIXED_RATIO for multi-window globally
+Subject: [PATCH 09/19] UI: Use SNAP_FIXED_RATIO for multi-window globally
 
 Enables multiple snap targets under landscape for phone UI
 
diff --git a/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch
similarity index 89%
rename from patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch
rename to patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch
index c9fc2ab..00a1e06 100644
--- a/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch
+++ b/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch
@@ -1,7 +1,7 @@
-From 398c29806a00747c917562f369f1e145a8ced079 Mon Sep 17 00:00:00 2001
+From 7a1136397113e10afc36276f70f62083c20abe95 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:43:12 -0800
-Subject: [PATCH 11/21] core: Remove old app target SDK dialog
+Subject: [PATCH 10/19] core: Remove old app target SDK dialog
 
 If an app is old, users should already know that, and there's usually no
 point in warning them about it because they would already be using a
diff --git a/patches_platform/frameworks_base/0012-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch b/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch
similarity index 92%
rename from patches_platform/frameworks_base/0012-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch
rename to patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch
index 9ef71b1..431dd4a 100644
--- a/patches_platform/frameworks_base/0012-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch
+++ b/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch
@@ -1,7 +1,7 @@
-From 3185f1dfa835f44776fdfdb4533d352006dd8349 Mon Sep 17 00:00:00 2001
+From 00f4d1dfbf1e280000872545d873fef7fec30ba0 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 8 Mar 2022 20:37:33 -0800
-Subject: [PATCH 12/21] SystemUI: Always refresh power menu on UI mode change
+Subject: [PATCH 11/19] SystemUI: Always refresh power menu on UI mode change
 
 This is necessary for reliably theming the global actions dialog with
 dynamic colors and adapting it to light/dark themes.
diff --git a/patches_platform/frameworks_base/0013-SystemUI-Use-Monet-colors-for-power-menu.patch b/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch
similarity index 95%
rename from patches_platform/frameworks_base/0013-SystemUI-Use-Monet-colors-for-power-menu.patch
rename to patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch
index 8472bf4..9aed3eb 100644
--- a/patches_platform/frameworks_base/0013-SystemUI-Use-Monet-colors-for-power-menu.patch
+++ b/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch
@@ -1,7 +1,7 @@
-From 812d2f8e61a60008d2e2a40d20279bb9a8e822a1 Mon Sep 17 00:00:00 2001
+From b708cbead42948667b098a818432c073169c6ffa Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 9 Oct 2021 14:39:38 -0700
-Subject: [PATCH 13/21] SystemUI: Use Monet colors for power menu
+Subject: [PATCH 12/19] SystemUI: Use Monet colors for power menu
 
 It's odd that the power menu doesn't use Monet colors, unlike most of
 System UI. This makes it feel more integrated with the rest of the
diff --git a/patches_platform/frameworks_base/0014-Revert-Make-QS-always-use-dark-theme-colors.patch b/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch
similarity index 94%
rename from patches_platform/frameworks_base/0014-Revert-Make-QS-always-use-dark-theme-colors.patch
rename to patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch
index fb14a1e..91f76da 100644
--- a/patches_platform/frameworks_base/0014-Revert-Make-QS-always-use-dark-theme-colors.patch
+++ b/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch
@@ -1,7 +1,7 @@
-From 61d33e3c7c715f8545d87414dcc7d552ea74817f Mon Sep 17 00:00:00 2001
+From 485e73406b919813149356a66bb3b92c5a4fd216 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Wed, 6 Oct 2021 18:40:30 -0700
-Subject: [PATCH 14/21] Revert "Make QS always use dark theme colors"
+Subject: [PATCH 13/19] Revert "Make QS always use dark theme colors"
 
 This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5.
 
diff --git a/patches_platform/frameworks_base/0015-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch b/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
similarity index 91%
rename from patches_platform/frameworks_base/0015-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
rename to patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
index 9929ba8..8fe1da9 100644
--- a/patches_platform/frameworks_base/0015-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
+++ b/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
@@ -1,7 +1,7 @@
-From 29f62822e50aeb4e4f55ca19f6c4e5c5446500b1 Mon Sep 17 00:00:00 2001
+From 3e3f73958f43aa63986cac35a119467ca4cafbd8 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Wed, 6 Oct 2021 18:41:11 -0700
-Subject: [PATCH 15/21] Revert "Do not re-inflate QS and SB when
+Subject: [PATCH 14/19] Revert "Do not re-inflate QS and SB when
  CONFIG_UI_MODE"
 
 This reverts commit 8a40ff855b86bc86e23367017002289920855a4e.
diff --git a/patches_platform/frameworks_base/0016-SystemUI-Follow-light-dark-theme-in-quick-settings.patch b/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
similarity index 99%
rename from patches_platform/frameworks_base/0016-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
rename to patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
index afb4f47..4def3e2 100644
--- a/patches_platform/frameworks_base/0016-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
+++ b/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
@@ -1,7 +1,7 @@
-From a8a7179f4ff9e0eaa89a0521249cc18662d5cf0e Mon Sep 17 00:00:00 2001
+From 11dd90792ba2293e623a686cea1f4a61ed292993 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:24:58 -0700
-Subject: [PATCH 16/21] SystemUI: Follow light/dark theme in quick settings
+Subject: [PATCH 15/19] SystemUI: Follow light/dark theme in quick settings
 
 Android 12's dual-tone style where the quick settings panel is always
 dark makes the light theme look like a second-class citizen. Pure black
diff --git a/patches_platform/frameworks_base/0017-SystemUI-Initialize-QS-tiles-in-inactive-state.patch b/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
similarity index 91%
rename from patches_platform/frameworks_base/0017-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
rename to patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
index 9091c14..6e74b4d 100644
--- a/patches_platform/frameworks_base/0017-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
+++ b/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
@@ -1,7 +1,7 @@
-From 78256a2d065b0f0ee85221f92911e56389963d97 Mon Sep 17 00:00:00 2001
+From 51ddcd1625e36db7a7817c8fdcf78008e3dcc472 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:25:02 -0700
-Subject: [PATCH 17/21] SystemUI: Initialize QS tiles in inactive state
+Subject: [PATCH 16/19] SystemUI: Initialize QS tiles in inactive state
 
 Now that the QS fragment is recreated when changing the UI mode (so that
 it follows light/dark themes), all tiles flash with active color briefly
diff --git a/patches_platform/frameworks_base/0018-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch b/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
similarity index 98%
rename from patches_platform/frameworks_base/0018-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
rename to patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
index 0bf301f..c76800c 100644
--- a/patches_platform/frameworks_base/0018-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
+++ b/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
@@ -1,7 +1,7 @@
-From be98345ce808cf14de1a8510fcdb32bb0a0bbc64 Mon Sep 17 00:00:00 2001
+From 8015abe8a29cf35760b18691a8e732f0d1b84b65 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:25:08 -0700
-Subject: [PATCH 18/21] SystemUI: Add dual-tone light and dark themes for QS
+Subject: [PATCH 17/19] SystemUI: Add dual-tone light and dark themes for QS
 
 Google's dual-tone QS design where the notification panel has a
 semantically higher elevation adds depth to the notification+QS shade,
diff --git a/patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch
similarity index 92%
rename from patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch
rename to patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch
index 89e7267..00f5243 100644
--- a/patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch
+++ b/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch
@@ -1,7 +1,7 @@
-From 6eebbd51cb280cb8322ea841ad91458d85d41183 Mon Sep 17 00:00:00 2001
+From 757fc3ae84413ca0b158c1a4f5fa6b18d517beab Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
-Subject: [PATCH 19/21] Paint: Enable subpixel text positioning by default
+Subject: [PATCH 18/19] Paint: Enable subpixel text positioning by default
 
 On desktop Linux, subpixel text positioning is necessary to avoid
 kerning issues, and Android is no different. Even though most phone
diff --git a/patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch b/patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch
similarity index 96%
rename from patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch
rename to patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch
index e4fda5a..4704fe7 100644
--- a/patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch
+++ b/patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch
@@ -1,7 +1,7 @@
-From 321d9207a07cc8c129355e58c0dc0ef28e226c2d Mon Sep 17 00:00:00 2001
+From 80a2541826f9faa2f58c135dcbafb81f1399dcfb Mon Sep 17 00:00:00 2001
 From: SagarMakhar <sagarmakhar@gmail.com>
 Date: Sat, 6 Nov 2021 13:16:24 +0000
-Subject: [PATCH 21/21] Fix QS clock being white on light theme
+Subject: [PATCH 19/19] Fix QS clock being white on light theme
 
 Steps to reproduce without this commit:
 - Turn off dark theme
diff --git a/patches_platform/frameworks_base/0020-monet-Fix-overly-low-chroma-for-tones-below-90.patch b/patches_platform/frameworks_base/0020-monet-Fix-overly-low-chroma-for-tones-below-90.patch
deleted file mode 100644
index e52eb54..0000000
--- a/patches_platform/frameworks_base/0020-monet-Fix-overly-low-chroma-for-tones-below-90.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1c8f6f63245625aa095121a611ab67c39f061f77 Mon Sep 17 00:00:00 2001
-From: Danny Lin <danny@kdrag0n.dev>
-Date: Fri, 18 Mar 2022 23:19:54 -0700
-Subject: [PATCH 20/21] monet: Fix overly low chroma for tones below 90
-
-Chroma is capped to 40 for light colors of L* 90 and above for valid
-reasons. However, assigning the capped value to "chroma" fails to
-account for the fact that chroma is an argument passed to the method,
-so the capping effect persists across iterations. This unintentionally
-affects and limits the chroma of *all* shades because the first
-iteration of the loop is L*=90.
-
-As a result, almost all colors are less chromatic than the intended
-chroma >= 48. Fix the issue by assigning capped chroma to a temporary
-per-iteration variable.
-
-Change-Id: I18102d0072c89535e27f23fdb98af7c83864ff7e
----
- .../monet/src/com/android/systemui/monet/Shades.java        | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java b/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java
-index aab3538e3c4c..c5b9458614e1 100644
---- a/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java
-+++ b/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java
-@@ -59,10 +59,8 @@ public class Shades {
-         shades[1] = ColorUtils.CAMToColor(hue, Math.min(40f, chroma), 95);
-         for (int i = 2; i < 12; i++) {
-             float lStar = (i == 6) ? MIDDLE_LSTAR : 100 - 10 * (i - 1);
--            if (lStar >= 90) {
--                chroma = Math.min(40f, chroma);
--            }
--            shades[i] = ColorUtils.CAMToColor(hue, chroma, lStar);
-+            float shadeChroma = (lStar >= 90) ? Math.min(40f, chroma) : chroma;
-+            shades[i] = ColorUtils.CAMToColor(hue, shadeChroma, lStar);
-         }
-         return shades;
-     }
--- 
-2.25.1
-
diff --git a/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch b/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch
index 13fe716..152bc82 100644
--- a/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch
+++ b/patches_platform/vendor_lineage/0001-vendor_lineage-Log-privapp-permissions-whitelist-vio.patch
@@ -1,4 +1,4 @@
-From 96a347318969323185d15ddc86e464a2beef458f Mon Sep 17 00:00:00 2001
+From e1dc1797dff7d100154071384be787816b28a5ae Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Sep 2019 02:08:22 +0000
 Subject: [PATCH 1/2] vendor_lineage: Log privapp-permissions whitelist
@@ -10,12 +10,12 @@ Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config/common.mk b/config/common.mk
-index 44db025a..ddb688c0 100644
+index 913d36fb..9cf7f816 100644
 --- a/config/common.mk
 +++ b/config/common.mk
-@@ -74,9 +74,9 @@ PRODUCT_COPY_FILES += \
- PRODUCT_COPY_FILES += \
-     vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml
+@@ -78,9 +78,9 @@ PRODUCT_COPY_FILES += \
+ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+     persist.wm.enable_remote_keyguard_animation=0
  
 -# Enforce privapp-permissions whitelist
 +# Log privapp-permissions whitelist violations
diff --git a/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch b/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch
index 5f10cf1..ca82e11 100644
--- a/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch
+++ b/patches_platform/vendor_lineage/0002-Revert-overlay-Default-to-night-mode.patch
@@ -1,4 +1,4 @@
-From bd9f9e0fab155e87e20de3f8abde37b65b9a46e2 Mon Sep 17 00:00:00 2001
+From a57f80f3a5570710a915141687eac995b52aa486 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 14 Mar 2022 03:44:59 +0000
 Subject: [PATCH 2/2] Revert "overlay: Default to night mode"
@@ -11,10 +11,10 @@ Change-Id: I036bdd576e536392cf41e3c536d5ca2eb04e5a0f
  1 file changed, 8 deletions(-)
 
 diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
-index 8028dc8d..179f96d7 100644
+index 19104aa4..337c3f9f 100644
 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
-@@ -155,12 +155,4 @@
+@@ -144,12 +144,4 @@
      <bool name="config_supportsMicToggle">true</bool>
      <!-- Whether this device is supporting the camera toggle -->
      <bool name="config_supportsCamToggle">true</bool>
diff --git a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
index 1cf3045..1adfc85 100644
--- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
@@ -1,7 +1,7 @@
-From a86f12661378d2ec17acf7f3a6811fee45ec5c69 Mon Sep 17 00:00:00 2001
+From 86d6f44dc9416d088604aec09d6ceb333899bd33 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 01/15] Add MiuiNavbarOverlay
+Subject: [PATCH 01/16] Add MiuiNavbarOverlay
 
 Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 ---
diff --git a/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch
index 418c21c..0c20000 100644
--- a/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch
+++ b/patches_platform_personal/frameworks_base/0002-Disable-cursor-drag-by-default-for-editable-TextView.patch
@@ -1,7 +1,7 @@
-From c0b7cd81b24e7ca43f86394e7e23f64b9aca6084 Mon Sep 17 00:00:00 2001
+From 53fd03722a9a1fa09054f4c3a368140e20ea866f 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 02/15] Disable cursor drag by default for editable TextViews
+Subject: [PATCH 02/16] Disable cursor drag by default for editable TextViews
 
 Requested by @TadiT7
 
diff --git a/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch b/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch
index 839737e..a526f88 100644
--- a/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch
+++ b/patches_platform_personal/frameworks_base/0003-Disable-FP-lockouts.patch
@@ -1,7 +1,7 @@
-From 95a969046908077ee6f6d12898ca9194b44a1baa Mon Sep 17 00:00:00 2001
+From 51cdf8b65466eeedb8a2c856666f51cb6f1fed34 Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
-Subject: [PATCH 03/15] Disable FP lockouts
+Subject: [PATCH 03/16] Disable FP lockouts
 
 Both timed and permanent lockouts - GET THE FUCK OUT
 Now targeting LockoutFramework, introduced in Android 12
diff --git a/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch
index fb4e294..8979b89 100644
--- a/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch
+++ b/patches_platform_personal/frameworks_base/0004-Keyguard-Adjust-clock-style.patch
@@ -1,7 +1,7 @@
-From 839e9920585fbc8e3abd28ce6dba8d76140ccfe2 Mon Sep 17 00:00:00 2001
+From 0112a0d00e937e8472dfde7976b5e67a9d1b9eec 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 04/15] Keyguard: Adjust clock style
+Subject: [PATCH 04/16] Keyguard: Adjust clock style
 
 Thinner font, less padding and unintrusive colors
 
diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
index 2c041ee..c5d5a40 100644
--- a/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
+++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
@@ -1,7 +1,7 @@
-From c4e09aa07f9a43fa53948d46e54bf07b81ea9363 Mon Sep 17 00:00:00 2001
+From 7f01826f95a5f48d94ccbd0b83a28cd8acdf7496 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 05/15] Keyguard: Hide padlock unless UDFPS is in use
+Subject: [PATCH 05/16] Keyguard: Hide padlock unless UDFPS is in use
 
 Fair enough Google, but don't give me that otherwise
 
diff --git a/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch
index 0cb686d..533f457 100644
--- a/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch
+++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Never-switch-to-large-clock.patch
@@ -1,7 +1,7 @@
-From 8c5ad3e0aad131a91b232f2712fb5093c8f71960 Mon Sep 17 00:00:00 2001
+From 45fa09cefe77021303c2904cd492d67a1ced90d3 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 06/15] Keyguard: Never switch to large clock
+Subject: [PATCH 06/16] Keyguard: Never switch to large clock
 
 It looks alright actually, but as always breaks under landscape
 
diff --git a/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch b/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch
index b9d5559..6b79f9c 100644
--- a/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch
+++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Refine-indication-text.patch
@@ -1,7 +1,7 @@
-From a1cdfc6f811a75295b4c1fff28d2b80b4e097935 Mon Sep 17 00:00:00 2001
+From 6b7493641b38d8bfc9d1e9f3d09deaabeaf4b2b9 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 07/15] Keyguard: Refine indication text
+Subject: [PATCH 07/16] Keyguard: Refine indication text
 
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
diff --git a/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch b/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
index 627c27f..3e7d3f2 100644
--- a/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
+++ b/patches_platform_personal/frameworks_base/0008-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
@@ -1,7 +1,7 @@
-From f708c045269ec504c7571120751e4a7465b9da63 Mon Sep 17 00:00:00 2001
+From 312bf4b794331d797c37b9e9bfe0f3a2605a4905 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 08/15] Keyguard/UI: Fix status bar / quick settings margins
+Subject: [PATCH 08/16] Keyguard/UI: Fix status bar / quick settings margins
  and paddings
 
 Last revised on 2022/03/13, targeting s-v2
diff --git a/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch b/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch
new file mode 100644
index 0000000..2ab1567
--- /dev/null
+++ b/patches_platform_personal/frameworks_base/0009-Replace-NTP-server.patch
@@ -0,0 +1,26 @@
+From 73f2f4f2bbdcc13a681b7cf730d8eb8d02150e4e Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 17 Apr 2022 08:48:42 +0000
+Subject: [PATCH 09/16] Replace NTP server
+
+Change-Id: I938ab46026d841e7536d8fc02b0ef6b28ebb6ea1
+---
+ core/res/res/values/config.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index 1b9306913e7d..38654117b95e 100644
+--- a/core/res/res/values/config.xml
++++ b/core/res/res/values/config.xml
+@@ -2246,7 +2246,7 @@
+     <bool name="config_actionMenuItemAllCaps">true</bool>
+ 
+     <!-- Remote server that can provide NTP responses. -->
+-    <string translatable="false" name="config_ntpServer">time.android.com</string>
++    <string translatable="false" name="config_ntpServer">cn.pool.ntp.org</string>
+     <!-- Normal polling frequency in milliseconds -->
+     <integer name="config_ntpPollingInterval">86400000</integer>
+     <!-- Try-again polling interval in milliseconds, in case the network request failed -->
+-- 
+2.25.1
+
diff --git a/patches_platform_personal/frameworks_base/0009-Revert-Update-RAT-icons-to-match-Silk-design.patch b/patches_platform_personal/frameworks_base/0010-Revert-Update-RAT-icons-to-match-Silk-design.patch
similarity index 99%
rename from patches_platform_personal/frameworks_base/0009-Revert-Update-RAT-icons-to-match-Silk-design.patch
rename to patches_platform_personal/frameworks_base/0010-Revert-Update-RAT-icons-to-match-Silk-design.patch
index ee06c3a..7d25d34 100644
--- a/patches_platform_personal/frameworks_base/0009-Revert-Update-RAT-icons-to-match-Silk-design.patch
+++ b/patches_platform_personal/frameworks_base/0010-Revert-Update-RAT-icons-to-match-Silk-design.patch
@@ -1,7 +1,7 @@
-From fc6384c6e6a7a607692eaa840f058926efb6e9cc Mon Sep 17 00:00:00 2001
+From 4c17766af4ece72a4170062ea381d90910ec96c4 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 09/15] Revert "Update RAT icons to match Silk design"
+Subject: [PATCH 10/16] Revert "Update RAT icons to match Silk design"
 
 This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
 ---
diff --git a/patches_platform_personal/frameworks_base/0010-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0011-UI-Always-render-windows-into-cutouts.patch
similarity index 96%
rename from patches_platform_personal/frameworks_base/0010-UI-Always-render-windows-into-cutouts.patch
rename to patches_platform_personal/frameworks_base/0011-UI-Always-render-windows-into-cutouts.patch
index 7bf5f7c..030cd41 100644
--- a/patches_platform_personal/frameworks_base/0010-UI-Always-render-windows-into-cutouts.patch
+++ b/patches_platform_personal/frameworks_base/0011-UI-Always-render-windows-into-cutouts.patch
@@ -1,7 +1,7 @@
-From 5d726b3f5d1dd47b1e3977056457eaf60d0cdd7e Mon Sep 17 00:00:00 2001
+From f94652bb879b8fbe9f9710276b7ca46fd0e8c76a 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 10/15] UI: Always render windows into cutouts
+Subject: [PATCH 11/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
diff --git a/patches_platform_personal/frameworks_base/0011-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0012-UI-Kill-rounded-corners-in-notification-scrim.patch
similarity index 89%
rename from patches_platform_personal/frameworks_base/0011-UI-Kill-rounded-corners-in-notification-scrim.patch
rename to patches_platform_personal/frameworks_base/0012-UI-Kill-rounded-corners-in-notification-scrim.patch
index 5bc242c..8d15b10 100644
--- a/patches_platform_personal/frameworks_base/0011-UI-Kill-rounded-corners-in-notification-scrim.patch
+++ b/patches_platform_personal/frameworks_base/0012-UI-Kill-rounded-corners-in-notification-scrim.patch
@@ -1,7 +1,7 @@
-From 1aaa4b3159f512f8b68a5e5241f7f6fc7c935bdd Mon Sep 17 00:00:00 2001
+From 4134c3669ab24d54ce58c4bd6ceca786b1d14907 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 11/15] UI: Kill rounded corners in notification scrim
+Subject: [PATCH 12/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
 
diff --git a/patches_platform_personal/frameworks_base/0012-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0013-UI-Reconfigure-power-menu-items.patch
similarity index 85%
rename from patches_platform_personal/frameworks_base/0012-UI-Reconfigure-power-menu-items.patch
rename to patches_platform_personal/frameworks_base/0013-UI-Reconfigure-power-menu-items.patch
index a828ed8..ed2cef1 100644
--- a/patches_platform_personal/frameworks_base/0012-UI-Reconfigure-power-menu-items.patch
+++ b/patches_platform_personal/frameworks_base/0013-UI-Reconfigure-power-menu-items.patch
@@ -1,7 +1,7 @@
-From 3e381b9531ec859b912233c8977b61892d4f4761 Mon Sep 17 00:00:00 2001
+From a268294cefcabea1dc8759409419d4307a36b839 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 12/15] UI: Reconfigure power menu items
+Subject: [PATCH 13/16] UI: Reconfigure power menu items
 
 Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 ---
@@ -9,7 +9,7 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 1b9306913e7d..29f203450151 100644
+index 38654117b95e..137efaec97fc 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
 @@ -3016,13 +3016,10 @@
diff --git a/patches_platform_personal/frameworks_base/0013-UI-Reconfigure-quick-settings-tiles.patch b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-quick-settings-tiles.patch
similarity index 88%
rename from patches_platform_personal/frameworks_base/0013-UI-Reconfigure-quick-settings-tiles.patch
rename to patches_platform_personal/frameworks_base/0014-UI-Reconfigure-quick-settings-tiles.patch
index a9a6842..8a47620 100644
--- a/patches_platform_personal/frameworks_base/0013-UI-Reconfigure-quick-settings-tiles.patch
+++ b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-quick-settings-tiles.patch
@@ -1,7 +1,7 @@
-From be315261fe42efec4ce88b6823bae0fdd85540f1 Mon Sep 17 00:00:00 2001
+From 0345bd3c25148d7dc10b84b1a32be96b3ab81879 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Mar 2022 01:43:37 +0000
-Subject: [PATCH 13/15] UI: Reconfigure quick settings tiles
+Subject: [PATCH 14/16] UI: Reconfigure quick settings tiles
 
 Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 ---
diff --git a/patches_platform_personal/frameworks_base/0014-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
similarity index 88%
rename from patches_platform_personal/frameworks_base/0014-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
rename to patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
index a1c1499..b349bc0 100644
--- a/patches_platform_personal/frameworks_base/0014-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
@@ -1,7 +1,7 @@
-From eaed6b4ac160afa6fbdd56ae394f8ea9ba112a11 Mon Sep 17 00:00:00 2001
+From 2ae7a729e6a9bc4cae65ca0793f4834487172c63 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 14/15] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+Subject: [PATCH 15/16] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
 
 I decide what's good enough for a wallpaper!
 
diff --git a/patches_platform_personal/frameworks_base/0015-UI-Remove-privacy-dot-padding.patch b/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch
similarity index 89%
rename from patches_platform_personal/frameworks_base/0015-UI-Remove-privacy-dot-padding.patch
rename to patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch
index 34ad9ce..d3df882 100644
--- a/patches_platform_personal/frameworks_base/0015-UI-Remove-privacy-dot-padding.patch
+++ b/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch
@@ -1,7 +1,7 @@
-From 6f457ab5206ae4186cfad8f296402d226c9b0744 Mon Sep 17 00:00:00 2001
+From 3821df3d4498bc7b5f148e93303543f281a53ce8 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 15/15] UI: Remove privacy dot padding
+Subject: [PATCH 16/16] UI: Remove privacy dot padding
 
 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
 ---
diff --git a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
index 9fe8087..20298ac 100644
--- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
@@ -1,4 +1,4 @@
-From aa427f049c4ef72ac9151c0aab67923dfe071920 Mon Sep 17 00:00:00 2001
+From 3ae6c0a36285aee1b18aca199593c828d9d6d2ec 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 1/3] DeskClock: Remove night mode
@@ -28,10 +28,10 @@ index 1680aab83..73375dcfa 100644
 \ No newline at end of file
 +</PreferenceScreen>
 diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
-index 49530d44c..864a41575 100644
+index 29cc13ff9..8def22b30 100644
 --- a/src/com/android/deskclock/Screensaver.java
 +++ b/src/com/android/deskclock/Screensaver.java
-@@ -164,9 +164,8 @@ public final class Screensaver extends DreamService {
+@@ -141,9 +141,8 @@ public final class Screensaver extends DreamService {
  
      private void setClockStyle() {
          Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock);
@@ -44,10 +44,10 @@ index 49530d44c..864a41575 100644
  
      /**
 diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
-index e1db8c5ff..a735263b3 100644
+index cf770086b..7a756df7d 100644
 --- a/src/com/android/deskclock/ScreensaverActivity.java
 +++ b/src/com/android/deskclock/ScreensaverActivity.java
-@@ -117,7 +117,7 @@ public class ScreensaverActivity extends BaseActivity {
+@@ -107,7 +107,7 @@ public class ScreensaverActivity extends BaseActivity {
          Utils.setClockIconTypeface(mMainClockView);
          Utils.setTimeFormat((TextClock) digitalClock, false);
          Utils.setClockStyle(digitalClock, analogClock);
diff --git a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch
index dd04c45..5f553b6 100644
--- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch
@@ -1,4 +1,4 @@
-From c41f2ff6fbb5c2ca72d4f03bb459159c56966968 Mon Sep 17 00:00:00 2001
+From fe60811c629e1e8376955463f4f0dafc5b832056 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 19 Jan 2022 18:04:36 +0000
 Subject: [PATCH 2/3] DeskClock: Adapt digital clocks to S style
@@ -13,23 +13,23 @@ Caveats/TODO:
 
 Change-Id: I10c6fa213c89ac2f6e342be13fdd6390f7f787b0
 ---
- res/layout-land/main_clock_frame.xml          | 18 ++---
- res/layout/date_and_next_alarm_time.xml       | 51 ++++++------
+ res/layout-land/main_clock_frame.xml          | 19 ++---
+ res/layout/date_and_next_alarm_time.xml       | 57 +++++++-------
  res/layout/desk_clock_saver.xml               | 12 +--
  res/layout/digital_widget.xml                 | 71 ++++++++---------
  res/layout/digital_widget_sizer.xml           | 77 ++++++++-----------
- res/layout/main_clock_frame.xml               | 21 +++--
+ res/layout/main_clock_frame.xml               | 23 +++---
  res/values/dimens.xml                         | 12 ++-
- res/values/styles.xml                         | 18 +++++
- .../alarmclock/DigitalAppWidgetProvider.java  | 29 ++++---
+ res/values/styles.xml                         | 19 +++++
+ .../alarmclock/DigitalAppWidgetProvider.java  | 31 ++++----
  src/com/android/deskclock/AlarmUtils.java     |  2 +-
- 10 files changed, 162 insertions(+), 149 deletions(-)
+ 10 files changed, 167 insertions(+), 156 deletions(-)
 
 diff --git a/res/layout-land/main_clock_frame.xml b/res/layout-land/main_clock_frame.xml
-index b72f62333..afa9404f3 100644
+index 6abfdddd6..8ad98c0cf 100644
 --- a/res/layout-land/main_clock_frame.xml
 +++ b/res/layout-land/main_clock_frame.xml
-@@ -20,10 +20,11 @@
+@@ -21,10 +21,11 @@
      android:gravity="center_horizontal"
      android:orientation="vertical">
  
@@ -44,36 +44,38 @@ index b72f62333..afa9404f3 100644
  
          <com.android.deskclock.AnalogClock
              android:id="@+id/analog_clock"
-@@ -37,16 +38,13 @@
+@@ -38,19 +39,13 @@
  
          <com.android.deskclock.widget.AutoSizingTextClock
              android:id="@+id/digital_clock"
 -            style="@style/display_time"
 +            style="@style/sc_keyguard_clock"
              android:layout_width="wrap_content"
--            android:layout_height="wrap_content"
+             android:layout_height="wrap_content"
 -            android:ellipsize="none"
 -            android:singleLine="true"
--            android:textSize="@dimen/main_clock_digital_font_size" />
-+            android:layout_height="wrap_content" />
+-            android:textSize="@dimen/main_clock_digital_font_size"
+             tools:text="01:23" />
  
 -    </FrameLayout>
 +        <include layout="@layout/date_and_next_alarm_time" />
  
--    <include layout="@layout/date_and_next_alarm_time" />
+-    <include layout="@layout/date_and_next_alarm_time"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal"/>
 +    </LinearLayout>
  
-     <View
-         android:id="@+id/hairline"
+ </LinearLayout>
 diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
-index ad25502a8..d89172637 100644
+index 23df1cd3b..b29ffedcf 100644
 --- a/res/layout/date_and_next_alarm_time.xml
 +++ b/res/layout/date_and_next_alarm_time.xml
-@@ -18,34 +18,39 @@
-     xmlns:android="http://schemas.android.com/apk/res/android"
+@@ -18,36 +18,41 @@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
--    android:layout_gravity="center"
+     xmlns:tools="http://schemas.android.com/tools"
+-    android:layout_gravity="center_vertical"
 -    android:gravity="center">
 +    android:gravity="center_vertical|start"
 +    android:orientation="vertical">
@@ -84,9 +86,10 @@ index ad25502a8..d89172637 100644
 +        style="@style/sc_keyguard_row"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
--        android:textAllCaps="true" />
+-        android:textAllCaps="true"
 +        android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
-+        android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
++        android:paddingStart="@dimen/sc_keyguard_row_date_start_padding"
+         tools:text="Sa., 01.01."/>
  
 -    <TextView
 -        android:id="@+id/nextAlarmIcon"
@@ -104,15 +107,18 @@ index ad25502a8..d89172637 100644
 -    <TextView
 -        android:id="@+id/nextAlarm"
 -        style="@style/body"
-+    <LinearLayout
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
--        android:textAllCaps="true" />
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:textAllCaps="true"
+-        tools:text="Mo., 07:00"/>
 -
 -</LinearLayout>
 \ No newline at end of file
-+        android:paddingTop="@dimen/sc_keyguard_row_top_padding"
-+        android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
++    <LinearLayout
++         android:layout_width="wrap_content"
++         android:layout_height="wrap_content"
++         android:paddingTop="@dimen/sc_keyguard_row_top_padding"
++         android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
 +
 +        <TextView
 +            android:id="@+id/nextAlarmIcon"
@@ -128,7 +134,8 @@ index ad25502a8..d89172637 100644
 +            android:id="@+id/nextAlarm"
 +            style="@style/sc_keyguard_row"
 +            android:layout_width="wrap_content"
-+            android:layout_height="wrap_content" />
++            android:layout_height="wrap_content"
++            tools:text="Mo., 07:00"/>
 +
 +    </LinearLayout>
 +
@@ -367,59 +374,55 @@ index f524cf536..b9a28c79f 100644
      </LinearLayout>
  
 diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
-index ab960728f..72b71d4f4 100644
+index 159956f19..d0701eaf0 100644
 --- a/res/layout/main_clock_frame.xml
 +++ b/res/layout/main_clock_frame.xml
-@@ -33,10 +33,11 @@
-         android:gravity="center_horizontal"
-         android:orientation="vertical">
+@@ -24,11 +24,11 @@
+     android:layout_marginEnd="24dp"
+     android:orientation="vertical">
  
--        <FrameLayout
-+        <LinearLayout
-             android:layout_width="wrap_content"
--            android:layout_height="0dp"
--            android:layout_weight="1">
-+            android:layout_height="wrap_content"
-+            android:gravity="center_vertical|start"
-+            android:orientation="vertical">
+-    <FrameLayout
++    <LinearLayout
+         android:layout_width="wrap_content"
+-        android:layout_height="0dp"
+-        android:layout_weight="1"
+-        android:layout_gravity="start">
++        android:layout_height="wrap_content"
++        android:gravity="center_vertical|start"
++        android:orientation="vertical">
  
-             <com.android.deskclock.AnalogClock
-                 android:id="@+id/analog_clock"
-@@ -50,18 +51,14 @@
+         <com.android.deskclock.AnalogClock
+             android:id="@+id/analog_clock"
+@@ -42,17 +42,14 @@
  
-             <com.android.deskclock.widget.AutoSizingTextClock
-                 android:id="@+id/digital_clock"
--                style="@style/display_time"
-+                style="@style/sc_keyguard_clock"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
--                android:ellipsize="none"
--                android:includeFontPadding="false"
--                android:paddingTop="@dimen/main_clock_digital_padding"
--                android:singleLine="true"
--                android:textSize="@dimen/main_clock_digital_font_size" />
-+                android:paddingTop="@dimen/main_clock_digital_padding" />
+         <com.android.deskclock.widget.AutoSizingTextClock
+             android:id="@+id/digital_clock"
+-            style="@style/display_time"
+-            android:layout_width="match_parent"
++            style="@style/sc_keyguard_clock"
++            android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:ellipsize="none"
+-            android:includeFontPadding="false"
+             android:paddingTop="@dimen/main_clock_digital_padding"
+-            android:singleLine="true"
+-            android:textSize="@dimen/main_clock_digital_font_size"
+             tools:text="01:23" />
  
--        </FrameLayout>
-+            <include layout="@layout/date_and_next_alarm_time" />
- 
--        <include layout="@layout/date_and_next_alarm_time" />
-+        </LinearLayout>
- 
-         <View
-             android:id="@+id/hairline"
-@@ -77,4 +74,4 @@
-         android:layout_height="match_parent"
-         android:layout_weight="@integer/gutter_width_percent" />
+-    </FrameLayout>
++        <include layout="@layout/date_and_next_alarm_time" />
++
++    </LinearLayout>
  
+-    <include layout="@layout/date_and_next_alarm_time" />
 -</LinearLayout>
 \ No newline at end of file
 +</LinearLayout>
 diff --git a/res/values/dimens.xml b/res/values/dimens.xml
-index 6a384e94b..c4b47abb7 100644
+index 856ef8241..3061e27f6 100644
 --- a/res/values/dimens.xml
 +++ b/res/values/dimens.xml
-@@ -62,7 +62,7 @@
+@@ -61,7 +61,7 @@
      <dimen name="body_font_padding">4dp</dimen>
  
      <dimen name="alarm_label_size">14sp</dimen>
@@ -428,10 +431,10 @@ index 6a384e94b..c4b47abb7 100644
  
      <dimen name="backspace_icon_size">24dp</dimen>
      <dimen name="no_alarms_size">90dp</dimen>
-@@ -129,4 +129,14 @@
+@@ -140,4 +140,14 @@
+     <dimen name="alarm_clock_expanded_vertical_margin">8dp</dimen>
  
-     <!-- KitKat floating action button container height; see -v21 folder for newer platforms. -->
-     <dimen name="fab_height">96dp</dimen>
+     <dimen name="settings_padding">4dp</dimen>
 +
 +    <!-- Keyguard dimens, taken from S fwb -->
 +    <dimen name="sc_keyguard_clock_text_size">86dp</dimen>
@@ -444,13 +447,14 @@ index 6a384e94b..c4b47abb7 100644
 +    <dimen name="sc_keyguard_row_alarm_start_padding">5.5dp</dimen>
  </resources>
 diff --git a/res/values/styles.xml b/res/values/styles.xml
-index fbe62ae3a..e9ae028f9 100644
+index 7ae54c97c..73a800383 100644
 --- a/res/values/styles.xml
 +++ b/res/values/styles.xml
-@@ -134,4 +134,22 @@
-         <item name="android:numbersSelectorColor">?attr/colorAccent</item>
+@@ -187,4 +187,23 @@
+     <style name="TextAppearance.Title" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+         <item name="android:textSize">22.0sp</item>
      </style>
- 
++
 +    <style name="sc_keyguard_clock">
 +        <item name="android:fontFamily">sans-serif-light</item>
 +        <item name="android:fontFeatureSettings">tnum</item>
@@ -471,19 +475,19 @@ index fbe62ae3a..e9ae028f9 100644
 +
  </resources>
 diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
-index 80a724e85..52685f1f4 100644
+index e31f2d801..a93766697 100644
 --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
 +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
-@@ -211,7 +211,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -212,7 +212,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          if (Utils.isWidgetClickable(wm, widgetId)) {
              final Intent openApp = new Intent(context, DeskClock.class);
-             final PendingIntent pi = PendingIntent.getActivity(context, 0, openApp, 0);
+             final PendingIntent pi = PendingIntent.getActivity(context, 0, openApp, FLAG_IMMUTABLE);
 -            rv.setOnClickPendingIntent(R.id.digital_widget, pi);
 +            rv.setOnClickPendingIntent(R.id.digital_widget_actual, pi);
          }
  
          // Configure child views of the remote view.
-@@ -243,7 +243,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -244,7 +244,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          final int targetWidthPx = portrait ? minWidthPx : maxWidthPx;
          final int targetHeightPx = portrait ? maxHeightPx : minHeightPx;
          final int largestClockFontSizePx =
@@ -492,7 +496,7 @@ index 80a724e85..52685f1f4 100644
  
          // Create a size template that describes the widget bounds.
          final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx);
-@@ -314,13 +314,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -316,13 +316,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          }
  
          // Measure the widget at the largest possible size.
@@ -508,7 +512,7 @@ index 80a724e85..52685f1f4 100644
          if (low.hasViolations()) {
              return low;
          }
-@@ -332,7 +332,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -334,7 +334,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
                  return low;
              }
  
@@ -517,7 +521,7 @@ index 80a724e85..52685f1f4 100644
              if (midSize.hasViolations()) {
                  high = midSize;
              } else {
-@@ -395,7 +395,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -397,7 +397,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
       * the offscreen {@code sizer} view. Measure the {@code sizer} view and return the resulting
       * size measurements.
       */
@@ -526,7 +530,7 @@ index 80a724e85..52685f1f4 100644
          // Create a copy of the given template sizes.
          final Sizes measuredSizes = template.newSize();
  
-@@ -406,13 +406,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -408,13 +408,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          final TextView nextAlarmIcon = (TextView) sizer.findViewById(R.id.nextAlarmIcon);
  
          // Adjust the font sizes.
@@ -542,7 +546,7 @@ index 80a724e85..52685f1f4 100644
  
          // Measure and layout the sizer.
          final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
-@@ -493,11 +493,16 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -495,12 +495,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; }
          private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; }
          private int getClockFontSizePx() { return mClockFontSizePx; }
@@ -557,12 +561,14 @@ index 80a724e85..52685f1f4 100644
 -            mFontSizePx = max(1, round(clockFontSizePx / 7.5f));
 -            mIconFontSizePx = (int) (mFontSizePx * 1.4f);
 -            mIconPaddingPx = mFontSizePx / 3;
+-        }
 +            mFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardRowTextSizePx));
 +            mIconFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardAlarmIconSizePx));
 +            mIconPaddingPx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) alarmIconPaddingPx));
-         }
++         }
  
          /**
+          * @return the amount of widget height available to the world cities list
 diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java
 index db60ace95..43767d313 100644
 --- a/src/com/android/deskclock/AlarmUtils.java
diff --git a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
index 7a3d68d..39cf6d0 100644
--- a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch
@@ -1,4 +1,4 @@
-From b7ba7cad21377d1be5c7999595164cf4f7480a3d Mon Sep 17 00:00:00 2001
+From dffc4d40020757da96c73e62a78ce94d6277feba Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 20 Jan 2022 04:42:03 +0000
 Subject: [PATCH 3/3] DeskClock: Wallpaper-based text coloring for digital
@@ -12,7 +12,7 @@ Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3
  1 file changed, 57 insertions(+)
 
 diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
-index 52685f1f4..fec78bed7 100644
+index a93766697..de56f09ca 100644
 --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
 +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
 @@ -19,6 +19,8 @@ package com.android.alarmclock;
@@ -24,7 +24,7 @@ index 52685f1f4..fec78bed7 100644
  import android.appwidget.AppWidgetManager;
  import android.appwidget.AppWidgetProvider;
  import android.content.ComponentName;
-@@ -108,12 +110,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -109,12 +111,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
      /** Intent used to deliver the {@link #ACTION_ON_DAY_CHANGE} callback. */
      private static final Intent DAY_CHANGE_INTENT = new Intent(ACTION_ON_DAY_CHANGE);
  
@@ -65,7 +65,7 @@ index 52685f1f4..fec78bed7 100644
      }
  
      @Override
-@@ -203,6 +233,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -204,6 +234,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
       */
      private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId,
              Bundle options, boolean portrait) {
@@ -85,7 +85,7 @@ index 52685f1f4..fec78bed7 100644
          // Create a remote view for the digital clock.
          final String packageName = context.getPackageName();
          final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget);
-@@ -260,6 +303,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -261,6 +304,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          rv.setTextViewTextSize(R.id.nextAlarm, COMPLEX_UNIT_PX, sizes.mFontSizePx);
          rv.setTextViewTextSize(R.id.clock, COMPLEX_UNIT_PX, sizes.mClockFontSizePx);
  
@@ -103,7 +103,7 @@ index 52685f1f4..fec78bed7 100644
          final int smallestWorldCityListSizePx =
                  resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size);
          if (sizes.getListHeight() <= smallestWorldCityListSizePx) {
-@@ -414,6 +468,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+@@ -416,6 +470,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
          nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
          nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
  
diff --git 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
index a801a12..54c3151 100644
--- 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
@@ -1,4 +1,4 @@
-From 940eb9c4c8d7ef6a722422b3ff089e50a1c207d2 Mon Sep 17 00:00:00 2001
+From 7a76da8c2ef814eddc37fe3a2756ba2af6984aec 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)
diff --git 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
index b1bb448..00d6ac0 100644
--- 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
@@ -1,4 +1,4 @@
-From fa188d3c18299cee7a6dc09cfdd78e92d1018019 Mon Sep 17 00:00:00 2001
+From bef1ea091cc0765fcd7eca1e9e41147abea407d1 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)
diff --git a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
index ccc35f1..a8b73e9 100644
--- a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
+++ b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
@@ -1,4 +1,4 @@
-From e41dc69996cf9931b36be2b08ec3f316d1b3a63c Mon Sep 17 00:00:00 2001
+From 24a7525c5f58f94423f052b772949a4344bc89ee Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Mon, 1 Jul 2019 07:03:04 +0000
 Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again
diff --git a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch
index b8376b6..4c3a5d6 100644
--- a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch
+++ b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch
@@ -1,9 +1,9 @@
-From 54580a295da1f927d2809ed58c61254bdb4ded0a Mon Sep 17 00:00:00 2001
+From b304d258198c2b7e4b481e9803a8463bb0cf395d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 9 Apr 2022 02:48:55 +0000
 Subject: [PATCH 4/4] vendor_lineage: Personal theme as SRO
 
-Last revised on 2022/04/09
+Last revised on 2022/04/24
 
 ...
 
@@ -11,55 +11,55 @@ I look forward to what LOS will look like in the future, when everything's ready
 
 Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
 ---
- config/common.mk                              |   7 +-
- .../res/drawable/ic_launcher_background.xml   |  24 ++++
- .../res/drawable/ic_launcher_foreground.xml   |  39 ++++++
- .../res/drawable/ic_launcher_background.xml   |  27 ++++
- .../res/drawable/ic_launcher_foreground.xml   |  36 +++++
- .../res/drawable/ic_launcher_background.xml   |  20 +++
- .../res/drawable/ic_launcher_foreground.xml   |  36 +++++
- .../res/drawable/ic_launcher_background.xml   |  23 ++++
- .../res/drawable/ic_launcher_foreground.xml   |  39 ++++++
- .../apps/DeskClock/res/layout/desk_clock.xml  | 130 ++++++++++++++++++
- .../DeskClock/res/values-night/colors.xml     |   6 +
- .../apps/DeskClock/res/values/colors.xml      |   6 +
- .../res/drawable/ic_launcher_background.xml   |  14 ++
- .../res/drawable/ic_launcher_foreground.xml   |  41 ++++++
- .../res/drawable/ic_launcher_background.xml   |  17 +++
- .../res/drawable/ic_launcher_foreground.xml   |  34 +++++
- .../res/drawable/ic_launcher_background.xml   |  22 +++
- .../res/drawable/ic_launcher_foreground.xml   |  34 +++++
- .../res/drawable/ic_launcher_background.xml   |  14 ++
- .../res/drawable/ic_launcher_foreground.xml   |  38 +++++
- .../res/drawable/ic_launcher_background.xml   |  17 +++
- .../res/drawable/ic_launcher_foreground.xml   |  57 ++++++++
- .../ExactCalculator/res/values/colors.xml     |   4 +
- .../res/drawable/ic_launcher_background.xml   |  24 ++++
- .../res/drawable/ic_launcher_foreground.xml   |  33 +++++
- .../res/drawable/ic_launcher_background.xml   |  17 +++
- .../res/drawable/ic_launcher_foreground.xml   |  33 +++++
- .../Jelly/app/src/main/res/values/colors.xml  |   4 +
- .../res/drawable/ic_launcher_background.xml   |  18 +++
- .../res/drawable/ic_launcher_foreground.xml   |  34 +++++
- .../apps/Messaging/res/values/colors.xml      |   7 +
- .../Messaging/res/values/lineage_colors.xml   |   4 +
- .../res/drawable/ic_launcher_background.xml   |  23 ++++
- .../res/drawable/ic_launcher_foreground.xml   |  33 +++++
- .../app/src/main/res/values-night/colors.xml  |   4 +
- .../app/src/main/res/values/colors.xml        |   4 +
- .../res/drawable/ic_launcher_background.xml   |  18 +++
- .../res/drawable/ic_launcher_foreground.xml   |  33 +++++
- 38 files changed, 972 insertions(+), 2 deletions(-)
+ config/common.mk                              |  7 ++-
+ .../res/drawable/ic_launcher_background.xml   | 24 ++++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 39 ++++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 24 ++++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 33 ++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 14 +++++
+ .../res/drawable/ic_launcher_foreground.xml   | 33 ++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 20 +++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 36 +++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 23 +++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 39 ++++++++++++
+ .../apps/DeskClock/res/values/colors.xml      |  8 +++
+ .../res/drawable/ic_launcher_background.xml   | 14 +++++
+ .../res/drawable/ic_launcher_foreground.xml   | 41 +++++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 17 ++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 34 +++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 22 +++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 34 +++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 14 +++++
+ .../res/drawable/ic_launcher_foreground.xml   | 40 +++++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 14 +++++
+ .../res/drawable/ic_launcher_foreground.xml   | 60 +++++++++++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 24 ++++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 34 +++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 17 ++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 33 ++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 18 ++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 34 +++++++++++
+ .../apps/Messaging/res/values/colors.xml      |  7 +++
+ .../Messaging/res/values/lineage_colors.xml   |  4 ++
+ .../res/drawable/ic_launcher_background.xml   | 23 +++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 33 ++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 18 ++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 33 ++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 23 +++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 34 +++++++++++
+ .../res/drawable/ic_launcher_background.xml   | 20 +++++++
+ .../res/drawable/ic_launcher_foreground.xml   | 34 +++++++++++
+ 38 files changed, 977 insertions(+), 2 deletions(-)
  create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml
  create mode 100644 overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml
+ create mode 100644 overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml
+ create mode 100644 overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml
  create mode 100644 overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml
  create mode 100644 overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml
- create mode 100644 overlay/personal/packages/apps/DeskClock/res/layout/desk_clock.xml
- create mode 100644 overlay/personal/packages/apps/DeskClock/res/values-night/colors.xml
  create mode 100644 overlay/personal/packages/apps/DeskClock/res/values/colors.xml
  create mode 100644 overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml
@@ -71,28 +71,28 @@ Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc
  create mode 100644 overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_foreground.xml
  create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml
- create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/values/colors.xml
  create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml
  create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml
- create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/values/colors.xml
  create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml
  create mode 100644 overlay/personal/packages/apps/Messaging/res/values/colors.xml
  create mode 100644 overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml
  create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml
- create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/values-night/colors.xml
- create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/values/colors.xml
  create mode 100644 overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml
  create mode 100644 overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml
+ create mode 100644 overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml
+ create mode 100644 overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml
+ create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml
+ create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml
 
 diff --git a/config/common.mk b/config/common.mk
-index e6a7d87a..9fd5db10 100644
+index e9e0c2d5..9687b647 100644
 --- a/config/common.mk
 +++ b/config/common.mk
-@@ -184,10 +184,13 @@ endif
+@@ -188,10 +188,13 @@ endif
  PRODUCT_DEXPREOPT_SPEED_APPS += \
      SystemUI
  
@@ -110,7 +110,7 @@ index e6a7d87a..9fd5db10 100644
      TrebuchetOverlay
 diff --git a/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..c69cb4a7
+index 00000000..9a30966d
 --- /dev/null
 +++ b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,24 @@
@@ -129,18 +129,18 @@ index 00000000..c69cb4a7
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
 +        android:pathData="M0,0h108v108h-108z"
-+        android:fillColor="#2A3232"/>
++        android:fillColor="@android:color/system_accent1_800"/>
 +    <path
 +        android:pathData="M0,0L108,0L65.314,42.686C62.418,39.791 58.418,38 54,38C45.163,38 38,45.163 38,54C38,58.418 39.791,62.418 42.686,65.314L0,108L0,0Z"
-+        android:fillColor="#4D84E9"/>
++        android:fillColor="@android:color/system_accent1_500"/>
 +    <path
 +        android:pathData="M65.314,65.314L108,108L108,0L65.314,42.686C68.209,45.582 70,49.582 70,54C70,58.418 68.209,62.418 65.314,65.314Z"
-+        android:fillColor="#994D84E9"/>
++        android:fillColor="@android:color/system_accent1_600"/>
 +  </group>
 +</vector>
 diff --git a/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..8c633187
+index 00000000..64ffa3df
 --- /dev/null
 +++ b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,39 @@
@@ -163,7 +163,7 @@ index 00000000..8c633187
 +        android:fillColor="#ffffff"/>
 +    <path
 +        android:pathData="M54,54m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
-+        android:fillColor="#2A3232"/>
++        android:fillColor="@android:color/system_accent1_700"/>
 +    <path
 +        android:pathData="M54,54m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
 +        android:fillColor="#ffffff"/>
@@ -185,10 +185,10 @@ index 00000000..8c633187
 +</vector>
 diff --git a/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..db9be19e
+index 00000000..db946c4e
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,24 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     SPDX-FileCopyrightText: 2022 The LineageOS Project
@@ -201,27 +201,24 @@ index 00000000..db9be19e
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#666666"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M52.472,34C50.957,34 49.572,34.856 48.894,36.211L47,40L33.084,43.274C31.277,43.7 30,45.312 30,47.168V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V46.599C78,45.019 77.069,43.586 75.625,42.944L69,40L67.106,36.211C66.428,34.856 65.043,34 63.528,34H52.472Z"
-+      android:fillColor="#98A7A7"
++      android:fillColor="#FFFFFF"
 +      android:fillType="evenOdd"/>
 +  <path
 +      android:pathData="M30,47.171C30,45.314 31.278,43.701 33.086,43.277L38,42.124V70.001H34C31.791,70.001 30,68.21 30,66.001V47.171Z"
-+      android:fillColor="#D0D7D8"/>
++      android:fillColor="@android:color/system_neutral1_100"/>
 +  <path
 +      android:pathData="M34,47m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-+      android:fillColor="#0092E4"/>
-+  <path
-+      android:pathData="M58,54m-14,0a14,14 0,1 1,28 0a14,14 0,1 1,-28 0"
-+      android:fillColor="#666666"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..ab24a759
+index 00000000..ca215f97
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,33 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     SPDX-FileCopyrightText: 2022 The LineageOS Project
@@ -237,11 +234,67 @@ index 00000000..ab24a759
 +    <clip-path
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
-+        android:pathData="M58,55m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
-+        android:fillColor="#596666"/>
++        android:pathData="M58,54m-14,0a14,14 0,1 1,28 0a14,14 0,1 1,-28 0"
++        android:fillColor="@android:color/system_accent1_600"/>
 +    <path
-+        android:pathData="M58,55m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0"
-+        android:fillColor="#2A3232"/>
++        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
++        android:fillAlpha="0.6">
++      <aapt:attr name="android:fillColor">
++        <gradient
++            android:gradientRadius="72"
++            android:centerX="28.54"
++            android:centerY="28.54"
++            android:type="radial">
++          <item android:offset="0" android:color="#19FFFFFF"/>
++          <item android:offset="1" android:color="#00FFFFFF"/>
++        </gradient>
++      </aapt:attr>
++    </path>
++  </group>
++</vector>
+diff --git a/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml
+new file mode 100644
+index 00000000..65b0e2db
+--- /dev/null
++++ b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml
+@@ -0,0 +1,14 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++     SPDX-FileCopyrightText: 2022 The LineageOS Project
++     SPDX-License-Identifier: Apache-2.0
++-->
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++    android:width="108dp"
++    android:height="108dp"
++    android:viewportWidth="108"
++    android:viewportHeight="108">
++  <path
++      android:pathData="M0,0h108v108h-108z"
++      android:fillColor="@android:color/system_accent1_600"/>
++</vector>
+diff --git a/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml
+new file mode 100644
+index 00000000..ae31cbef
+--- /dev/null
++++ b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml
+@@ -0,0 +1,33 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++     SPDX-FileCopyrightText: 2022 The LineageOS Project
++     SPDX-License-Identifier: Apache-2.0
++-->
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:aapt="http://schemas.android.com/aapt"
++    android:width="108dp"
++    android:height="108dp"
++    android:viewportWidth="108"
++    android:viewportHeight="108">
++  <group>
++    <clip-path
++        android:pathData="M0,0h108v108h-108z"/>
++    <path
++        android:pathData="M65,52.167V55.833H72.333V52.167H65ZM61.333,64.285C63.093,65.587 65.385,67.31 67.2,68.667C67.933,67.695 68.667,66.705 69.4,65.733C67.585,64.377 65.293,62.653 63.533,61.333C62.8,62.323 62.067,63.313 61.333,64.285ZM69.4,42.267C68.667,41.295 67.933,40.305 67.2,39.333C65.385,40.69 63.093,42.413 61.333,43.733C62.067,44.705 62.8,45.695 63.533,46.667C65.293,45.347 67.585,43.642 69.4,42.267ZM39.333,48.5C37.317,48.5 35.667,50.15 35.667,52.167V55.833C35.667,57.85 37.317,59.5 39.333,59.5H41.167V66.833H44.833V59.5H46.667L55.833,65V43L46.667,48.5H39.333ZM60.417,54C60.417,51.562 59.353,49.362 57.667,47.858V60.123C59.353,58.638 60.417,56.438 60.417,54Z"
++        android:fillColor="#FFFFFF"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
 +        android:fillAlpha="0.6">
@@ -260,7 +313,7 @@ index 00000000..ab24a759
 +</vector>
 diff --git a/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..34a78556
+index 00000000..00262be1
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,20 @@
@@ -276,17 +329,17 @@ index 00000000..34a78556
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#2A56C6"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M77,51C77,59.837 70,63 61,63C52,63 45,59.837 45,51C45,38.163 52,31 61,31C70,31 77,38.163 77,51Z"
-+      android:fillColor="#CCCCCC"/>
++      android:fillColor="@android:color/system_neutral1_100"/>
 +  <path
 +      android:pathData="M71,49C68.569,50.255 64.821,51 61,51C57.179,51 53.431,50.255 51,49C52.093,52.47 54.333,57 61,57C67.667,57 69.907,52.47 71,49Z"
-+      android:fillColor="#1C3AA9"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..ce1f5832
+index 00000000..2a374437
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,36 @@
@@ -309,7 +362,7 @@ index 00000000..ce1f5832
 +        android:fillColor="#FFFFFF"/>
 +    <path
 +        android:pathData="M58,62C55.569,63.255 51.821,64 48,64C44.179,64 40.431,63.255 38,62C39.093,65.47 41.333,70 48,70C54.667,70 56.907,65.47 58,62Z"
-+        android:fillColor="#2A56C6"/>
++        android:fillColor="@android:color/system_accent1_600"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
 +        android:fillAlpha="0.6">
@@ -328,7 +381,7 @@ index 00000000..ce1f5832
 +</vector>
 diff --git a/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..a68fa731
+index 00000000..fb1b75c1
 --- /dev/null
 +++ b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,23 @@
@@ -344,20 +397,20 @@ index 00000000..a68fa731
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#333333"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M37.147,39.859C36.783,40.292 36.81,40.932 37.209,41.334L49.958,54.17C49.973,54.186 49.989,54.201 50.006,54.217C50.002,54.145 50,54.073 50,54C50,51.953 51.537,50.266 53.52,50.028C53.502,50.015 53.484,50.002 53.465,49.989L38.611,39.663C38.146,39.34 37.511,39.425 37.147,39.859Z"
-+      android:fillColor="#ffffff"/>
++      android:fillColor="@android:color/system_neutral1_100"/>
 +  <path
 +      android:pathData="M75.449,36.002C75.087,35.57 74.453,35.492 73.997,35.822L54.501,49.942C54.466,49.967 54.432,49.993 54.399,50.02C56.421,50.22 58,51.925 58,54C58,54.1 57.996,54.2 57.989,54.298C58.021,54.27 58.052,54.241 58.083,54.211L75.374,37.464C75.779,37.071 75.812,36.433 75.449,36.002Z"
-+      android:fillColor="#ffffff"/>
++      android:fillColor="@android:color/system_neutral1_100"/>
 +  <path
 +      android:pathData="M54,54m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
 +      android:fillColor="#98A7A7"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..bb985f9e
+index 00000000..f54da6b5
 --- /dev/null
 +++ b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,39 @@
@@ -379,11 +432,11 @@ index 00000000..bb985f9e
 +        android:pathData="M54,79L54,54"
 +        android:strokeWidth="2"
 +        android:fillColor="#00000000"
-+        android:strokeColor="#0288D1"
++        android:strokeColor="#FFFFFF"
 +        android:strokeLineCap="round"/>
 +    <path
 +        android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
-+        android:fillColor="#0277BD"/>
++        android:fillColor="#FFFFFF"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
 +        android:fillAlpha="0.6">
@@ -400,169 +453,23 @@ index 00000000..bb985f9e
 +    </path>
 +  </group>
 +</vector>
-diff --git a/overlay/personal/packages/apps/DeskClock/res/layout/desk_clock.xml b/overlay/personal/packages/apps/DeskClock/res/layout/desk_clock.xml
-new file mode 100644
-index 00000000..468fd39d
---- /dev/null
-+++ b/overlay/personal/packages/apps/DeskClock/res/layout/desk_clock.xml
-@@ -0,0 +1,130 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!--
-+  Copyright (C) 2016 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.
-+  -->
-+
-+<LinearLayout
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    xmlns:app="http://schemas.android.com/apk/res-auto"
-+    xmlns:tools="http://schemas.android.com/tools"
-+    android:layout_width="match_parent"
-+    android:layout_height="match_parent"
-+    android:orientation="vertical"
-+    app:statusBarBackground="@null"
-+    android:fitsSystemWindows="true">
-+
-+    <com.google.android.material.appbar.AppBarLayout
-+        android:layout_width="match_parent"
-+        android:layout_height="wrap_content"
-+        android:background="@null"
-+        app:elevation="0dp">
-+
-+        <androidx.appcompat.widget.Toolbar
-+            android:id="@+id/toolbar"
-+            android:layout_width="match_parent"
-+            android:layout_height="wrap_content"
-+            app:contentInsetStart="0dp"
-+            tools:ignore="RtlSymmetry"
-+            android:gravity="center">
-+
-+            <TextView
-+                android:id="@+id/title_view"
-+                android:layout_width="wrap_content"
-+                android:layout_height="wrap_content"
-+                android:layout_gravity="start|center_vertical"
-+                android:layout_marginStart="20dp"
-+                style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
-+
-+        </androidx.appcompat.widget.Toolbar>
-+    </com.google.android.material.appbar.AppBarLayout>
-+
-+    <androidx.coordinatorlayout.widget.CoordinatorLayout
-+        android:id="@+id/content"
-+        android:layout_width="match_parent"
-+        android:layout_height="0dp"
-+        android:layout_weight="1">
-+
-+        <FrameLayout
-+            android:id="@+id/fragment_container"
-+            android:layout_width="match_parent"
-+            android:layout_height="match_parent"/>
-+
-+        <LinearLayout
-+            android:layout_width="match_parent"
-+            android:layout_height="wrap_content"
-+            android:layout_gravity="bottom"
-+            android:baselineAligned="false"
-+            android:orientation="horizontal"
-+            app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
-+
-+            <FrameLayout
-+                android:layout_width="0dp"
-+                android:layout_height="match_parent"
-+                android:layout_gravity="start|center_vertical"
-+                android:layout_weight="1">
-+
-+                <Button
-+                    android:id="@+id/left_button"
-+                    style="?attr/borderlessButtonStyle"
-+                    android:layout_width="wrap_content"
-+                    android:layout_height="wrap_content"
-+                    android:layout_gravity="center"
-+                    android:scaleType="centerInside" />
-+
-+            </FrameLayout>
-+
-+            <com.google.android.material.floatingactionbutton.FloatingActionButton
-+                android:id="@+id/fab"
-+                android:layout_width="wrap_content"
-+                android:layout_height="wrap_content"
-+                android:layout_gravity="center"
-+                android:layout_margin="@dimen/fab_margin"
-+                app:borderWidth="0dp"
-+                app:elevation="@dimen/fab_elevation" />
-+
-+            <FrameLayout
-+                android:layout_width="0dp"
-+                android:layout_height="match_parent"
-+                android:layout_gravity="end|center_vertical"
-+                android:layout_weight="1">
-+
-+                <Button
-+                    android:id="@+id/right_button"
-+                    style="?attr/borderlessButtonStyle"
-+                    android:layout_width="wrap_content"
-+                    android:layout_height="wrap_content"
-+                    android:layout_gravity="center"
-+                    android:scaleType="centerInside" />
-+
-+            </FrameLayout>
-+
-+        </LinearLayout>
-+
-+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-+
-+    <com.google.android.material.bottomnavigation.BottomNavigationView
-+        android:id="@+id/bottom_view"
-+        android:layout_width="match_parent"
-+        android:layout_height="wrap_content"
-+        android:layout_below="@id/content"
-+        android:background="@color/secondary_color"
-+        app:menu="@menu/bottom_navigation_menu"
-+        app:itemIconTint="@color/tab_tint_color"
-+        app:itemTextColor="@color/tab_tint_color"
-+        app:itemTextAppearanceActive="@style/navText"
-+        app:itemTextAppearanceInactive="@style/navText"
-+        app:labelVisibilityMode="labeled" />
-+
-+</LinearLayout>
-diff --git a/overlay/personal/packages/apps/DeskClock/res/values-night/colors.xml b/overlay/personal/packages/apps/DeskClock/res/values-night/colors.xml
-new file mode 100644
-index 00000000..3d7d294e
---- /dev/null
-+++ b/overlay/personal/packages/apps/DeskClock/res/values-night/colors.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+    <color name="default_background">#333333</color>
-+    <color name="accent_color">#0288D1</color>
-+    <color name="secondary_color">#333333</color>
-+</resources>
 diff --git a/overlay/personal/packages/apps/DeskClock/res/values/colors.xml b/overlay/personal/packages/apps/DeskClock/res/values/colors.xml
 new file mode 100644
-index 00000000..3d7d294e
+index 00000000..f147a9d1
 --- /dev/null
 +++ b/overlay/personal/packages/apps/DeskClock/res/values/colors.xml
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,8 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<resources>
-+    <color name="default_background">#333333</color>
-+    <color name="accent_color">#0288D1</color>
-+    <color name="secondary_color">#333333</color>
++    <color name="accent_color">@android:color/system_accent1_200</color>
++    <color name="accent_100">@android:color/system_accent1_100</color>
++    <color name="accent_200">@android:color/system_accent1_200</color>
++    <color name="accent_600">@android:color/system_accent1_600</color>
++    <color name="accent_900">@android:color/system_accent1_900</color>
 +</resources>
 diff --git a/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..c40a3141
+index 00000000..65b0e2db
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,14 @@
@@ -578,11 +485,11 @@ index 00000000..c40a3141
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#2A56C6"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..90a9876c
+index 00000000..a6847e2c
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,41 @@
@@ -602,11 +509,11 @@ index 00000000..90a9876c
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
 +        android:pathData="M47.422,77.789C48.1,79.144 49.485,80 51,80H61C62.515,80 63.9,79.144 64.578,77.789L66.578,73.789C67.141,72.663 67.141,71.337 66.578,70.211L64.578,66.211C63.9,64.856 62.515,64 61,64H51C49.485,64 48.1,64.856 47.422,66.211L45.422,70.211C44.859,71.337 44.859,72.663 45.422,73.789L47.422,77.789Z"
-+        android:fillColor="#CCCCCC"
++        android:fillColor="@android:color/system_neutral1_100"
 +        android:fillType="evenOdd"/>
 +    <path
 +        android:pathData="M47.422,30.211C48.1,28.856 49.485,28 51,28H61C62.515,28 63.9,28.856 64.578,30.211L66.578,34.211C67.141,35.337 67.141,36.663 66.578,37.789L64.578,41.789C63.9,43.144 62.515,44 61,44H51C49.485,44 48.1,43.144 47.422,41.789L45.422,37.789C44.859,36.663 44.859,35.337 45.422,34.211L47.422,30.211Z"
-+        android:fillColor="#CCCCCC"
++        android:fillColor="@android:color/system_neutral1_100"
 +        android:fillType="evenOdd"/>
 +    <path
 +        android:pathData="M41,54C41,43.751 43.836,37.383 45.422,34.211L47.425,30.209C48.102,28.855 49.486,28 51,28H61C59.486,28 58.102,28.855 57.425,30.209L55.422,34.211C53.836,37.383 51,43.751 51,54C51,64.249 53.836,70.617 55.422,73.789L57.425,77.791C58.102,79.145 59.486,80 61,80H51C49.486,80 48.102,79.145 47.425,77.791L45.422,73.789C43.836,70.617 41,64.249 41,54Z"
@@ -629,7 +536,7 @@ index 00000000..90a9876c
 +</vector>
 diff --git a/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..7768c809
+index 00000000..4f313e32
 --- /dev/null
 +++ b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,17 @@
@@ -645,14 +552,14 @@ index 00000000..7768c809
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#E3F2FD"/>
++      android:fillColor="@android:color/system_neutral1_100"/>
 +  <path
 +      android:pathData="M60,70m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
 +      android:fillColor="#FFFFFF"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..c92be957
+index 00000000..6d88a93d
 --- /dev/null
 +++ b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,34 @@
@@ -672,7 +579,7 @@ index 00000000..c92be957
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
 +        android:pathData="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V68C30,70.209 31.791,72 34,72H74C76.209,72 78,70.209 78,68V42C78,39.791 76.209,38 74,38H58L54.586,34.586C54.211,34.211 53.702,34 53.172,34H38.828C38.298,34 37.789,34.211 37.414,34.586L34,38Z"
-+        android:fillColor="#1E88E5"
++        android:fillColor="@android:color/system_accent1_600"
 +        android:fillType="evenOdd"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
@@ -692,7 +599,7 @@ index 00000000..c92be957
 +</vector>
 diff --git a/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..6c449c83
+index 00000000..f969cf68
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,22 @@
@@ -708,14 +615,14 @@ index 00000000..6c449c83
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#323C46"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M45,44V55.515C43.57,54.558 41.85,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72C44.971,72 49,67.971 49,63V48C49,45.791 50.791,44 53,44H67C69.209,44 71,45.791 71,48V55.515C69.57,54.558 67.85,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72C70.971,72 75,67.971 75,63V44C75,39.582 71.418,36 67,36H53C48.582,36 45,39.582 45,44ZM71,63C71,60.239 68.761,58 66,58C63.239,58 61,60.239 61,63C61,65.761 63.239,68 66,68C68.761,68 71,65.761 71,63ZM40,68C42.761,68 45,65.761 45,63C45,60.239 42.761,58 40,58C37.239,58 35,60.239 35,63C35,65.761 37.239,68 40,68Z"
-+      android:fillColor="#CCCCCC"
++      android:fillColor="@android:color/system_neutral1_100"
 +      android:fillType="evenOdd"/>
 +  <path
 +      android:pathData="M40,68C42.761,68 45,65.761 45,63C45,60.239 42.761,58 40,58C37.239,58 35,60.239 35,63C35,65.761 37.239,68 40,68ZM66,68C68.761,68 71,65.761 71,63C71,60.239 68.761,58 66,58C63.239,58 61,60.239 61,63C61,65.761 63.239,68 66,68Z"
-+      android:fillColor="#CCCCCC"
++      android:fillColor="@android:color/system_neutral1_100"
 +      android:fillType="evenOdd"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml
@@ -760,7 +667,7 @@ index 00000000..b2e98016
 +</vector>
 diff --git a/overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..96d1bced
+index 00000000..65b0e2db
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,14 @@
@@ -776,14 +683,14 @@ index 00000000..96d1bced
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#323C46"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..84f7005b
+index 00000000..18756857
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Etar/res/drawable/ic_launcher_foreground.xml
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,40 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     SPDX-FileCopyrightText: 2022 The LineageOS Project
@@ -799,12 +706,14 @@ index 00000000..84f7005b
 +    <clip-path
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
-+        android:pathData="M44,34H38C35.791,34 34,35.791 34,38V70C34,72.209 35.791,74 38,74H70C72.209,74 74,72.209 74,70V38C74,35.791 72.209,34 70,34H64Z"
-+        android:fillColor="#FFFFFF"
-+        android:fillType="evenOdd"/>
++        android:pathData="M34,42V70C34,72.209 35.791,74 38,74H70C72.209,74 74,72.209 74,70V42Z"
++        android:fillColor="#FFFFFF"/>
 +    <path
-+        android:pathData="M41.172,57.672H43.578C44.349,57.672 44.984,57.542 45.484,57.281C45.984,57.01 46.354,56.635 46.594,56.156C46.844,55.667 46.969,55.099 46.969,54.453C46.969,53.87 46.854,53.354 46.625,52.906C46.406,52.448 46.068,52.094 45.609,51.844C45.151,51.583 44.573,51.453 43.875,51.453C43.323,51.453 42.813,51.563 42.344,51.781C41.875,52 41.5,52.307 41.219,52.703C40.938,53.099 40.797,53.578 40.797,54.141H36.281C36.281,52.891 36.615,51.802 37.281,50.875C37.958,49.948 38.865,49.224 40,48.703C41.135,48.182 42.385,47.922 43.75,47.922C45.292,47.922 46.641,48.172 47.797,48.672C48.953,49.161 49.854,49.885 50.5,50.844C51.146,51.802 51.469,52.99 51.469,54.406C51.469,55.125 51.302,55.823 50.969,56.5C50.635,57.167 50.156,57.771 49.531,58.313C49.079,58.703 48.554,59.038 47.955,59.316C48.722,59.587 49.377,59.951 49.922,60.406C50.557,60.927 51.036,61.547 51.359,62.266C51.421,62.402 51.478,62.541 51.528,62.683C51.509,62.322 51.499,61.948 51.499,61.563V57.625C51.499,55.917 51.682,54.453 52.046,53.234C52.421,52.005 52.947,51 53.624,50.219C54.312,49.438 55.124,48.865 56.062,48.5C56.999,48.125 58.041,47.938 59.187,47.938C60.104,47.938 60.952,48.057 61.734,48.297C62.525,48.526 63.239,48.885 63.874,49.375C64.51,49.865 65.051,50.495 65.499,51.266C65.947,52.026 66.291,52.938 66.531,54C66.77,55.052 66.89,56.26 66.89,57.625V61.563C66.89,63.271 66.708,64.745 66.343,65.984C65.979,67.214 65.452,68.224 64.765,69.016C64.088,69.797 63.281,70.375 62.343,70.75C61.406,71.125 60.364,71.313 59.218,71.313C58.301,71.313 57.447,71.198 56.656,70.969C55.864,70.729 55.15,70.359 54.515,69.859C53.89,69.359 53.348,68.729 52.89,67.969C52.442,67.198 52.098,66.281 51.859,65.219C51.849,65.176 51.84,65.133 51.83,65.09C51.779,65.966 51.581,66.759 51.234,67.469C50.828,68.292 50.255,68.99 49.516,69.563C48.786,70.135 47.932,70.573 46.953,70.875C45.974,71.167 44.906,71.313 43.75,71.313C42.792,71.313 41.849,71.182 40.922,70.922C40.005,70.651 39.172,70.25 38.422,69.719C37.682,69.177 37.089,68.5 36.641,67.688C36.203,66.865 35.984,65.891 35.984,64.766H40.5C40.5,65.349 40.646,65.87 40.938,66.328C41.229,66.786 41.63,67.146 42.141,67.406C42.661,67.667 43.24,67.797 43.875,67.797C44.594,67.797 45.208,67.667 45.719,67.406C46.24,67.135 46.635,66.76 46.906,66.281C47.188,65.792 47.328,65.224 47.328,64.578C47.328,63.745 47.177,63.078 46.875,62.578C46.573,62.068 46.141,61.693 45.578,61.453C45.016,61.214 44.349,61.094 43.578,61.094H41.172V57.672ZM62.374,57.016V62.156C62.374,63.188 62.307,64.063 62.171,64.781C62.036,65.5 61.827,66.083 61.546,66.531C61.275,66.969 60.942,67.292 60.546,67.5C60.161,67.698 59.718,67.797 59.218,67.797C58.812,67.797 58.437,67.734 58.093,67.609C57.76,67.484 57.463,67.286 57.202,67.016C56.952,66.734 56.734,66.375 56.546,65.938C56.369,65.49 56.234,64.953 56.14,64.328C56.057,63.703 56.015,62.979 56.015,62.156V57.016C56.015,55.995 56.083,55.13 56.218,54.422C56.364,53.703 56.572,53.13 56.843,52.703C57.114,52.266 57.442,51.948 57.827,51.75C58.223,51.552 58.676,51.453 59.187,51.453C59.593,51.453 59.963,51.516 60.296,51.641C60.63,51.766 60.926,51.964 61.187,52.234C61.447,52.505 61.666,52.859 61.843,53.297C62.02,53.724 62.15,54.245 62.234,54.859C62.327,55.474 62.374,56.193 62.374,57.016Z"
-+        android:fillColor="#323C46"
++        android:pathData="M44,34H38C35.791,34 34,35.791 34,38V42H74V38C74,35.791 72.209,34 70,34H64Z"
++        android:fillColor="@android:color/system_neutral1_100"/>
++    <path
++        android:pathData="M43.672,56.072H46.078C46.849,56.072 47.484,55.942 47.984,55.681C48.484,55.41 48.854,55.035 49.094,54.556C49.344,54.067 49.469,53.499 49.469,52.853C49.469,52.27 49.354,51.754 49.125,51.306C48.906,50.848 48.568,50.494 48.109,50.244C47.651,49.983 47.073,49.853 46.375,49.853C45.823,49.853 45.313,49.963 44.844,50.181C44.375,50.4 44,50.707 43.719,51.103C43.438,51.499 43.297,51.978 43.297,52.541H38.781C38.781,51.291 39.115,50.202 39.781,49.275C40.458,48.348 41.365,47.624 42.5,47.103C43.635,46.582 44.885,46.322 46.25,46.322C47.792,46.322 49.141,46.572 50.297,47.072C51.453,47.561 52.354,48.285 53,49.244C53.646,50.202 53.969,51.39 53.969,52.806C53.969,53.525 53.802,54.223 53.469,54.9C53.135,55.567 52.656,56.171 52.031,56.713C51.579,57.103 51.054,57.438 50.455,57.716C51.222,57.987 51.877,58.351 52.422,58.806C53.057,59.327 53.536,59.947 53.859,60.666C53.921,60.802 53.978,60.941 54.028,61.083C54.009,60.722 53.999,60.348 53.999,59.963V56.025C53.999,54.317 54.182,52.853 54.546,51.634C54.921,50.405 55.447,49.4 56.124,48.619C56.812,47.838 57.624,47.265 58.562,46.9C59.499,46.525 60.541,46.338 61.687,46.338C62.604,46.338 63.452,46.457 64.234,46.697C65.025,46.926 65.739,47.285 66.374,47.775C67.01,48.265 67.551,48.895 67.999,49.666C68.447,50.426 68.791,51.338 69.031,52.4C69.27,53.452 69.39,54.66 69.39,56.025V59.963C69.39,61.671 69.208,63.145 68.843,64.384C68.479,65.614 67.952,66.624 67.265,67.416C66.588,68.197 65.781,68.775 64.843,69.15C63.906,69.525 62.864,69.713 61.718,69.713C60.801,69.713 59.947,69.598 59.156,69.369C58.364,69.129 57.65,68.759 57.015,68.259C56.39,67.759 55.848,67.129 55.39,66.369C54.942,65.598 54.598,64.681 54.359,63.619C54.349,63.576 54.34,63.533 54.33,63.49C54.279,64.366 54.081,65.159 53.734,65.869C53.328,66.692 52.755,67.39 52.016,67.963C51.286,68.535 50.432,68.973 49.453,69.275C48.474,69.567 47.406,69.713 46.25,69.713C45.292,69.713 44.349,69.582 43.422,69.322C42.505,69.051 41.672,68.65 40.922,68.119C40.182,67.577 39.589,66.9 39.141,66.088C38.703,65.265 38.484,64.291 38.484,63.166H43C43,63.749 43.146,64.27 43.438,64.728C43.729,65.186 44.13,65.546 44.641,65.806C45.161,66.067 45.74,66.197 46.375,66.197C47.094,66.197 47.708,66.067 48.219,65.806C48.74,65.535 49.135,65.16 49.406,64.681C49.688,64.192 49.828,63.624 49.828,62.978C49.828,62.145 49.677,61.478 49.375,60.978C49.073,60.468 48.641,60.093 48.078,59.853C47.516,59.614 46.849,59.494 46.078,59.494H43.672V56.072ZM64.874,55.416V60.556C64.874,61.588 64.807,62.463 64.671,63.181C64.536,63.9 64.327,64.483 64.046,64.931C63.775,65.369 63.442,65.692 63.046,65.9C62.661,66.098 62.218,66.197 61.718,66.197C61.312,66.197 60.937,66.134 60.593,66.009C60.26,65.884 59.963,65.686 59.702,65.416C59.452,65.134 59.234,64.775 59.046,64.338C58.869,63.89 58.734,63.353 58.64,62.728C58.557,62.103 58.515,61.379 58.515,60.556V55.416C58.515,54.395 58.583,53.53 58.718,52.822C58.864,52.103 59.072,51.53 59.343,51.103C59.614,50.666 59.942,50.348 60.327,50.15C60.723,49.952 61.176,49.853 61.687,49.853C62.093,49.853 62.463,49.916 62.796,50.041C63.13,50.166 63.426,50.364 63.687,50.634C63.947,50.905 64.166,51.259 64.343,51.697C64.52,52.124 64.65,52.645 64.734,53.259C64.827,53.874 64.874,54.593 64.874,55.416Z"
++        android:fillColor="@android:color/system_accent1_600"
 +        android:fillType="evenOdd"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
@@ -824,10 +733,10 @@ index 00000000..84f7005b
 +</vector>
 diff --git a/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..28caf96f
+index 00000000..65b0e2db
 --- /dev/null
 +++ b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,14 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     SPDX-FileCopyrightText: 2022 The LineageOS Project
@@ -840,17 +749,14 @@ index 00000000..28caf96f
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#666666"/>
-+  <path
-+      android:pathData="M0,0h108v46h-108z"
-+      android:fillColor="#333333"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..bdedbc2f
+index 00000000..faf2caf4
 --- /dev/null
 +++ b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,60 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     SPDX-FileCopyrightText: 2022 The LineageOS Project
@@ -866,6 +772,9 @@ index 00000000..bdedbc2f
 +    <clip-path
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
++        android:pathData="M42,32H66C67.105,32 68,32.895 68,34V45A1,1 0,0 1,67 46H41A1,1 0,0 1,40 45V34C40,32.895 40.895,32 42,32z"
++        android:fillColor="#ffffff"/>
++    <path
 +        android:pathData="M41,48L47,48A1,1 0,0 1,48 49L48,55A1,1 0,0 1,47 56L41,56A1,1 0,0 1,40 55L40,49A1,1 0,0 1,41 48z"
 +        android:fillColor="#ffffff"/>
 +    <path
@@ -879,19 +788,19 @@ index 00000000..bdedbc2f
 +        android:fillColor="#ffffff"/>
 +    <path
 +        android:pathData="M61,48L67,48A1,1 0,0 1,68 49L68,55A1,1 0,0 1,67 56L61,56A1,1 0,0 1,60 55L60,49A1,1 0,0 1,61 48z"
-+        android:fillColor="#4D84E9"/>
++        android:fillColor="@android:color/system_neutral1_100"/>
 +    <path
 +        android:pathData="M51,58L57,58A1,1 0,0 1,58 59L58,65A1,1 0,0 1,57 66L51,66A1,1 0,0 1,50 65L50,59A1,1 0,0 1,51 58z"
 +        android:fillColor="#ffffff"/>
 +    <path
 +        android:pathData="M61,58L67,58A1,1 0,0 1,68 59L68,65A1,1 0,0 1,67 66L61,66A1,1 0,0 1,60 65L60,59A1,1 0,0 1,61 58z"
-+        android:fillColor="#4D84E9"/>
++        android:fillColor="@android:color/system_neutral1_100"/>
 +    <path
 +        android:pathData="M51,68L57,68A1,1 0,0 1,58 69L58,75A1,1 0,0 1,57 76L51,76A1,1 0,0 1,50 75L50,69A1,1 0,0 1,51 68z"
 +        android:fillColor="#ffffff"/>
 +    <path
 +        android:pathData="M60,69C60,68.448 60.448,68 61,68H67C67.552,68 68,68.448 68,69V74C68,75.105 67.105,76 66,76H61C60.448,76 60,75.552 60,75V69Z"
-+        android:fillColor="#4D84E9"/>
++        android:fillColor="@android:color/system_neutral1_100"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
 +        android:fillAlpha="0.6">
@@ -908,19 +817,9 @@ index 00000000..bdedbc2f
 +    </path>
 +  </group>
 +</vector>
-diff --git a/overlay/personal/packages/apps/ExactCalculator/res/values/colors.xml b/overlay/personal/packages/apps/ExactCalculator/res/values/colors.xml
-new file mode 100644
-index 00000000..4c985230
---- /dev/null
-+++ b/overlay/personal/packages/apps/ExactCalculator/res/values/colors.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+	<color name="calculator_accent_color">#4D84E9</color>
-+</resources>
 diff --git a/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..4ef11067
+index 00000000..32abe0b8
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,24 @@
@@ -939,21 +838,21 @@ index 00000000..4ef11067
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
 +        android:pathData="M0,0h108v108h-108z"
-+        android:fillColor="#CBDEFB"/>
++        android:fillColor="#FFFFFF"/>
 +    <path
 +        android:pathData="M15,108L78,45L141,108H15Z"
-+        android:fillColor="#00354A"/>
++        android:fillColor="@android:color/system_neutral1_200"/>
 +    <path
-+        android:pathData="M61,13L45,29L61,45L77,29L61,13Z"
-+        android:fillColor="#F09F38"/>
++        android:pathData="M-18,108L45,45L108,108H-18Z"
++        android:fillColor="@android:color/system_neutral1_100"/>
 +  </group>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..9b3f52bd
+index 00000000..03b51d0c
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,34 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<!--
 +     SPDX-FileCopyrightText: 2022 The LineageOS Project
@@ -969,8 +868,9 @@ index 00000000..9b3f52bd
 +    <clip-path
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
-+        android:pathData="M-18,108L45,45L108,108H-18Z"
-+        android:fillColor="#0092E4"/>
++        android:pathData="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V42C78,39.791 76.209,38 74,38H34Z"
++        android:fillColor="@android:color/system_accent1_600"
++        android:fillType="evenOdd"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
 +        android:fillAlpha="0.6">
@@ -989,7 +889,7 @@ index 00000000..9b3f52bd
 +</vector>
 diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..5f443383
+index 00000000..bf75b615
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,17 @@
@@ -1005,14 +905,14 @@ index 00000000..5f443383
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#4D84E9"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M50.856,71.087C48.735,64.459 43.541,59.265 36.913,57.144L33.497,56.05C31.501,55.412 31.501,52.588 33.497,51.95L36.913,50.856C43.541,48.735 48.735,43.541 50.856,36.913L51.95,33.497C52.588,31.501 55.412,31.501 56.05,33.497L57.144,36.913C59.265,43.541 64.459,48.735 71.087,50.856L74.503,51.95C76.499,52.588 76.499,55.412 74.503,56.05L71.087,57.144C64.459,59.265 59.265,64.459 57.144,71.087L56.05,74.503C55.412,76.499 52.588,76.499 51.95,74.503L50.856,71.087Z"
 +      android:fillColor="#ffffff"/>
 +</vector>
 diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..d159f44a
+index 00000000..7f152b9c
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,33 @@
@@ -1032,7 +932,7 @@ index 00000000..d159f44a
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
 +        android:pathData="M53.229,61.503C51.872,58.519 49.481,56.128 46.497,54.771C45.834,54.47 45.834,53.53 46.497,53.229C49.481,51.872 51.872,49.481 53.229,46.497C53.53,45.834 54.47,45.834 54.771,46.497C56.128,49.481 58.519,51.872 61.503,53.229C62.166,53.53 62.166,54.47 61.503,54.771C58.519,56.128 56.128,58.519 54.771,61.503C54.47,62.166 53.53,62.166 53.229,61.503Z"
-+        android:fillColor="#4D84E9"/>
++        android:fillColor="@android:color/system_accent1_600"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
 +        android:fillAlpha="0.6">
@@ -1049,19 +949,9 @@ index 00000000..d159f44a
 +    </path>
 +  </group>
 +</vector>
-diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/values/colors.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/values/colors.xml
-new file mode 100644
-index 00000000..755d95ee
---- /dev/null
-+++ b/overlay/personal/packages/apps/Jelly/app/src/main/res/values/colors.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+    <color name="colorAccent">#4D84E9</color>
-+</resources>
 diff --git a/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..5da866ad
+index 00000000..b9256675
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,18 @@
@@ -1077,7 +967,7 @@ index 00000000..5da866ad
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#2A56C6"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M54,76C66.15,76 76,66.15 76,54C76,49.769 74.806,45.817 72.736,42.463L74.327,36.098C74.693,34.634 73.366,33.307 71.902,33.673L65.537,35.264C62.183,33.194 58.231,32 54,32C41.85,32 32,41.85 32,54C32,66.15 41.85,76 54,76Z"
 +      android:fillColor="#ffffff"
@@ -1085,7 +975,7 @@ index 00000000..5da866ad
 +</vector>
 diff --git a/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..b20c1322
+index 00000000..ab598892
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,34 @@
@@ -1105,7 +995,7 @@ index 00000000..b20c1322
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
 +        android:pathData="M54,66C60.75,66 66,63.627 66,57C66,47.373 60.75,42 54,42C47.25,42 42,47.373 42,57C42,63.627 47.25,66 54,66ZM54,57.5C57.057,57.5 60.055,56.942 62,56C61.125,58.603 59.333,62 54,62C48.667,62 46.875,58.603 46,56C47.945,56.942 50.943,57.5 54,57.5Z"
-+        android:fillColor="#2A56C6"
++        android:fillColor="@android:color/system_accent1_600"
 +        android:fillType="evenOdd"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
@@ -1148,7 +1038,7 @@ index 00000000..7b407a1c
 +</resources>
 diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..fbddcdd4
+index 00000000..afc988fc
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,23 @@
@@ -1164,7 +1054,7 @@ index 00000000..fbddcdd4
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#4D84E9"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M34,43L34,43A2,2 0,0 1,36 45L36,63A2,2 0,0 1,34 65L34,65A2,2 0,0 1,32 63L32,45A2,2 0,0 1,34 43z"
 +      android:fillColor="#ffffff"/>
@@ -1214,29 +1104,9 @@ index 00000000..1a699688
 +    </path>
 +  </group>
 +</vector>
-diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/values-night/colors.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/values-night/colors.xml
-new file mode 100644
-index 00000000..755d95ee
---- /dev/null
-+++ b/overlay/personal/packages/apps/Recorder/app/src/main/res/values-night/colors.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+    <color name="colorAccent">#4D84E9</color>
-+</resources>
-diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/values/colors.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/values/colors.xml
-new file mode 100644
-index 00000000..755d95ee
---- /dev/null
-+++ b/overlay/personal/packages/apps/Recorder/app/src/main/res/values/colors.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<resources>
-+    <color name="colorAccent">#4D84E9</color>
-+</resources>
 diff --git a/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml
 new file mode 100644
-index 00000000..4c0bb569
+index 00000000..19d7e4f0
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml
 @@ -0,0 +1,18 @@
@@ -1252,7 +1122,7 @@ index 00000000..4c0bb569
 +    android:viewportHeight="108">
 +  <path
 +      android:pathData="M0,0h108v108h-108z"
-+      android:fillColor="#666666"/>
++      android:fillColor="@android:color/system_accent1_600"/>
 +  <path
 +      android:pathData="M58.148,28C59.193,28 60.062,28.805 60.142,29.847L60.254,31.303C60.431,33.606 62.018,35.527 64.017,36.685C66.016,37.844 68.441,38.236 70.525,37.237L71.846,36.604C72.789,36.153 73.92,36.503 74.443,37.408L78.59,44.592C79.113,45.497 78.851,46.652 77.988,47.243L76.782,48.068C74.876,49.374 74,51.689 74,54C74,56.311 74.876,58.626 76.782,59.932L77.988,60.757C78.851,61.348 79.113,62.503 78.59,63.408L74.443,70.592C73.92,71.497 72.789,71.847 71.846,71.396L70.525,70.763C68.441,69.764 66.016,70.156 64.017,71.315C62.018,72.473 60.431,74.394 60.254,76.697L60.142,78.153C60.062,79.195 59.193,80 58.148,80H49.852C48.807,80 47.938,79.195 47.858,78.153L47.746,76.697C47.569,74.394 45.981,72.473 43.983,71.315C41.984,70.156 39.558,69.764 37.475,70.763L36.153,71.396C35.211,71.847 34.08,71.497 33.557,70.592L29.409,63.408C28.887,62.503 29.149,61.348 30.011,60.757L31.218,59.931C33.124,58.626 34,56.311 34,54C34,51.689 33.124,49.374 31.218,48.068L30.011,47.242C29.149,46.652 28.887,45.497 29.409,44.592L33.557,37.408C34.08,36.503 35.211,36.153 36.153,36.604L37.475,37.237C39.558,38.236 41.984,37.844 43.983,36.685C45.982,35.527 47.569,33.606 47.746,31.303L47.858,29.847C47.938,28.805 48.807,28 49.852,28H58.148ZM54,66C60.627,66 66,60.627 66,54C66,47.373 60.627,42 54,42C47.373,42 42,47.373 42,54C42,60.627 47.373,66 54,66Z"
 +      android:fillColor="#FFFFFF"
@@ -1260,7 +1130,7 @@ index 00000000..4c0bb569
 +</vector>
 diff --git a/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml
 new file mode 100644
-index 00000000..92fe4757
+index 00000000..8cd7953c
 --- /dev/null
 +++ b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml
 @@ -0,0 +1,33 @@
@@ -1279,7 +1149,7 @@ index 00000000..92fe4757
 +    <clip-path
 +        android:pathData="M0,0h108v108h-108z"/>
 +    <path
-+        android:pathData="M54,54m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
++        android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
 +        android:fillColor="#FFFFFF"/>
 +    <path
 +        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
@@ -1297,6 +1167,141 @@ index 00000000..92fe4757
 +    </path>
 +  </group>
 +</vector>
+diff --git a/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml
+new file mode 100644
+index 00000000..791bba6b
+--- /dev/null
++++ b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml
+@@ -0,0 +1,23 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++     SPDX-FileCopyrightText: 2022 The LineageOS Project
++     SPDX-License-Identifier: Apache-2.0
++-->
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++    android:width="108dp"
++    android:height="108dp"
++    android:viewportWidth="108"
++    android:viewportHeight="108">
++  <path
++      android:pathData="M0,0h108v108h-108z"
++      android:fillColor="#FFFFFF"/>
++  <path
++      android:pathData="M66,66m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
++      android:fillColor="@android:color/system_neutral1_100"/>
++  <path
++      android:pathData="M42,66m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
++      android:fillColor="@android:color/system_neutral1_100"/>
++  <path
++      android:pathData="M54,62m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
++      android:fillColor="@android:color/system_neutral1_200"/>
++</vector>
+diff --git a/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml
+new file mode 100644
+index 00000000..138b559b
+--- /dev/null
++++ b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++     SPDX-FileCopyrightText: 2022 The LineageOS Project
++     SPDX-License-Identifier: Apache-2.0
++-->
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:aapt="http://schemas.android.com/aapt"
++    android:width="108dp"
++    android:height="108dp"
++    android:viewportWidth="108"
++    android:viewportHeight="108">
++  <group>
++    <clip-path
++        android:pathData="M0,0h108v108h-108z"/>
++    <path
++        android:pathData="M108,0H0V108H108V0ZM42,30C39.791,30 38,31.791 38,34V74C38,76.209 39.791,78 42,78H66C68.209,78 70,76.209 70,74V34C70,31.791 68.209,30 66,30H42Z"
++        android:fillColor="@android:color/system_accent1_600"
++        android:fillType="evenOdd"/>
++    <path
++        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
++        android:fillAlpha="0.6">
++      <aapt:attr name="android:fillColor">
++        <gradient
++            android:gradientRadius="72"
++            android:centerX="28.54"
++            android:centerY="28.54"
++            android:type="radial">
++          <item android:offset="0" android:color="#19FFFFFF"/>
++          <item android:offset="1" android:color="#00FFFFFF"/>
++        </gradient>
++      </aapt:attr>
++    </path>
++  </group>
++</vector>
+diff --git a/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml
+new file mode 100644
+index 00000000..b70d3060
+--- /dev/null
++++ b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++     SPDX-FileCopyrightText: 2022 The LineageOS Project
++     SPDX-License-Identifier: Apache-2.0
++-->
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++    android:width="108dp"
++    android:height="108dp"
++    android:viewportWidth="108"
++    android:viewportHeight="108">
++  <path
++      android:pathData="M0,0h108v108h-108z"
++      android:fillColor="@android:color/system_accent1_600"/>
++  <path
++      android:pathData="M30,61C30,60.448 30.448,60 31,60H37C37.552,60 38,60.448 38,61V67C38,67.552 37.552,68 37,68H32C30.895,68 30,67.105 30,66V61Z"
++      android:fillColor="@android:color/system_accent1_10"/>
++  <path
++      android:pathData="M70,61C70,60.448 70.448,60 71,60H77C77.552,60 78,60.448 78,61V66C78,67.105 77.105,68 76,68H71C70.448,68 70,67.552 70,67V61Z"
++      android:fillColor="@android:color/system_accent1_10"/>
++</vector>
+diff --git a/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml
+new file mode 100644
+index 00000000..4e86fe3d
+--- /dev/null
++++ b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++     SPDX-FileCopyrightText: 2022 The LineageOS Project
++     SPDX-License-Identifier: Apache-2.0
++-->
++<vector xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:aapt="http://schemas.android.com/aapt"
++    android:width="108dp"
++    android:height="108dp"
++    android:viewportWidth="108"
++    android:viewportHeight="108">
++  <group>
++    <clip-path
++        android:pathData="M0,0h108v108h-108z"/>
++    <path
++        android:pathData="M30,42C30,40.895 30.895,40 32,40H37C37.552,40 38,40.448 38,41V47C38,47.552 37.552,48 37,48H31C30.448,48 30,47.552 30,47V42ZM40,51C40,50.448 40.448,50 41,50H47C47.552,50 48,50.448 48,51V57C48,57.552 47.552,58 47,58H41C40.448,58 40,57.552 40,57V51ZM41,40C40.448,40 40,40.448 40,41V47C40,47.552 40.448,48 41,48H47C47.552,48 48,47.552 48,47V41C48,40.448 47.552,40 47,40H41ZM50,51C50,50.448 50.448,50 51,50H57C57.552,50 58,50.448 58,51V57C58,57.552 57.552,58 57,58H51C50.448,58 50,57.552 50,57V51ZM51,40C50.448,40 50,40.448 50,41V47C50,47.552 50.448,48 51,48H57C57.552,48 58,47.552 58,47V41C58,40.448 57.552,40 57,40H51ZM40,61C40,60.448 40.448,60 41,60H67C67.552,60 68,60.448 68,61V67C68,67.552 67.552,68 67,68H41C40.448,68 40,67.552 40,67V61ZM61,50C60.448,50 60,50.448 60,51V57C60,57.552 60.448,58 61,58H67C67.552,58 68,57.552 68,57V51C68,50.448 67.552,50 67,50H61ZM60,41C60,40.448 60.448,40 61,40H67C67.552,40 68,40.448 68,41V47C68,47.552 67.552,48 67,48H61C60.448,48 60,47.552 60,47V41ZM71,40C70.448,40 70,40.448 70,41V47C70,47.552 70.448,48 71,48H77C77.552,48 78,47.552 78,47V42C78,40.895 77.105,40 76,40H71Z"
++        android:fillColor="#FFFFFF"
++        android:fillType="evenOdd"/>
++    <path
++        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
++        android:fillAlpha="0.6">
++      <aapt:attr name="android:fillColor">
++        <gradient
++            android:gradientRadius="72"
++            android:centerX="28.54"
++            android:centerY="28.54"
++            android:type="radial">
++          <item android:offset="0" android:color="#19FFFFFF"/>
++          <item android:offset="1" android:color="#00FFFFFF"/>
++        </gradient>
++      </aapt:attr>
++    </path>
++  </group>
++</vector>
 -- 
 2.25.1
 
diff --git a/patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch b/patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch
index f8c2298..a60afca 100644
--- a/patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch
+++ b/patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch
@@ -1,7 +1,7 @@
-From a194fe441f38c5844b1b40ad89dc8c46ce15283b Mon Sep 17 00:00:00 2001
+From 6e3563653fb94e815a76e98ab2db682b1120734b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 5 Aug 2019 18:09:50 +0200
-Subject: [PATCH 01/21] Fix BT in-call on CAF devices
+Subject: [PATCH 01/23] Fix BT in-call on CAF devices
 
 See https://github.com/phhusson/treble_experimentations/issues/374
 
diff --git a/patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch b/patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
index c9009cd..e7d47f1 100644
--- a/patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
+++ b/patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
@@ -1,7 +1,7 @@
-From 60072fd9b20c55faca220cee207ac63a506690cb Mon Sep 17 00:00:00 2001
+From 439f07ebcd8f22ae8a7ec5c59386967d8cb953f5 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 1 Oct 2019 13:35:49 +0200
-Subject: [PATCH 02/21] Add (partial, cam id is hardcoded) support for Asus ZF6
+Subject: [PATCH 02/23] Add (partial, cam id is hardcoded) support for Asus ZF6
  motor camera
 
 Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
diff --git a/patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch b/patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
index a1b1d19..0e7ad8b 100644
--- a/patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
+++ b/patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
@@ -1,7 +1,7 @@
-From 0df456a123afa586fda489992bf2aabc569fff47 Mon Sep 17 00:00:00 2001
+From 2ea65f01d378f37df840acc601a938c131fbce0b Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Thu, 23 Jan 2020 11:13:43 +0800
-Subject: [PATCH 03/21] audiopolicy: try again with trimmed audio port name if
+Subject: [PATCH 03/23] audiopolicy: try again with trimmed audio port name if
  not found
 
 * In Spreadtrum BSP, some audio routes may contain ports with extra
diff --git a/patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch b/patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
index 7e6ccf2..29b2d77 100644
--- a/patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
+++ b/patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
@@ -1,7 +1,7 @@
-From e20eeef0160a265369850933afca8308c1ae8d65 Mon Sep 17 00:00:00 2001
+From 7e1a90bc11800f0267f3a610db2f8a0b5f6cee0a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 13 Apr 2020 21:01:16 +0200
-Subject: [PATCH 04/21] There are three SCO devices. Fallback from one to the
+Subject: [PATCH 04/23] There are three SCO devices. Fallback from one to the
  others if needed
 
 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
diff --git a/patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch b/patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
index 0a744ed..e17afc9 100644
--- a/patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
+++ b/patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
@@ -1,7 +1,7 @@
-From ec32f391f2e32d57996d633ca0ed69fe8a8a7702 Mon Sep 17 00:00:00 2001
+From c8a3d642465a97ca862de7840ddc7522ed13037d Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 14 May 2020 19:54:55 +0200
-Subject: [PATCH 05/21] Add persist.sys.phh.samsung.camera_ids property to
+Subject: [PATCH 05/23] Add persist.sys.phh.samsung.camera_ids property to
  access hidden Samsung cameras
 
 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
diff --git a/patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch b/patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch
index 49ab8cd..baca545 100644
--- a/patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch
+++ b/patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch
@@ -1,7 +1,7 @@
-From 7e4e53bb24ba8c02be74fb76abbf91d0db47c218 Mon Sep 17 00:00:00 2001
+From ba8531becc9b9cb3acafd25ef99c30228120a932 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 19 May 2020 14:01:14 +0200
-Subject: [PATCH 06/21] Add a property to force camera timestamp source
+Subject: [PATCH 06/23] Add a property to force camera timestamp source
 
 Some devices wrongly report their timesource
 Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME
diff --git a/patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch b/patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch
index bb5aeea..7681bf9 100644
--- a/patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch
+++ b/patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch
@@ -1,7 +1,7 @@
-From f1bcd5087da97f44f857c2fa541bb37b3fdc6d9d Mon Sep 17 00:00:00 2001
+From 08e26789bcc3c2ce86c2f2158a384404dd718165 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 24 Apr 2018 00:14:28 +0200
-Subject: [PATCH 07/21] FIH devices: Fix "Earpiece" audio output
+Subject: [PATCH 07/23] FIH devices: Fix "Earpiece" audio output
 
 On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
 Earpiece is not listed in attachedDevices, and devicePort's profile
diff --git a/patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch b/patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
index e0ed21a..40d4c12 100644
--- a/patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
+++ b/patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
@@ -1,7 +1,7 @@
-From 70bcea5cf514fbff58e39ca049542c9a73125e1a Mon Sep 17 00:00:00 2001
+From 692a52722f8d42cf9050debaba290cd26c628a04 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Sep 2020 12:32:50 +0200
-Subject: [PATCH 08/21] No longer make re-assigning legacy audio groups fatal.
+Subject: [PATCH 08/23] No longer make re-assigning legacy audio groups fatal.
  Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
  by framework too
 
diff --git a/patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch b/patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
index 214e0db..6092cfc 100644
--- a/patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
+++ b/patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
@@ -1,7 +1,7 @@
-From ffe42225949b781674c2a66056b5bab3a707c2be Mon Sep 17 00:00:00 2001
+From 294fd56f000ff05d3982c6a0342f85ab07f85a51 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 25 May 2020 21:26:54 +0200
-Subject: [PATCH 09/21] Add persist.sys.phh.disable_a2dp_offload property to
+Subject: [PATCH 09/23] Add persist.sys.phh.disable_a2dp_offload property to
  force a2dp offload
 
 Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
diff --git a/patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch b/patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch
index d97ffaf..921c5b2 100644
--- a/patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch
+++ b/patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch
@@ -1,7 +1,7 @@
-From b61abf82f851557f5b8de4da800f3e9297917602 Mon Sep 17 00:00:00 2001
+From 5bd6c2771efe985f945be22f8855042ec8d36615 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 21 Dec 2020 20:19:11 +0100
-Subject: [PATCH 10/21] Make camera IDs filter-out optional
+Subject: [PATCH 10/23] Make camera IDs filter-out optional
 
 Nowadays most people have Camera 2 apps, and would like to have all
 cameras, rather than limit which cameras are available.
diff --git a/patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch b/patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch
index a3614fe..bd453eb 100644
--- a/patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch
+++ b/patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch
@@ -1,7 +1,7 @@
-From 031c6f960ea02acf8e43779c8f7e19d2c6ccad15 Mon Sep 17 00:00:00 2001
+From abab867d1e0f291606e107bc951d89087524dad9 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 13 Mar 2021 14:20:03 -0500
-Subject: [PATCH 11/21] Support Samsung R multi-cams
+Subject: [PATCH 11/23] Support Samsung R multi-cams
 
 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
 ---
diff --git a/patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch b/patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch
index baa0ff4..29f409e 100644
--- a/patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch
+++ b/patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch
@@ -1,7 +1,7 @@
-From c96b60d01a1b131092218cd3810bf2c0cdd71c70 Mon Sep 17 00:00:00 2001
+From 7331481390a299313bf5bd94a419efc652b04e5e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 00:16:42 +0100
-Subject: [PATCH 12/21] Don't crash on unknown audio devices
+Subject: [PATCH 12/23] Don't crash on unknown audio devices
 
 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
 ---
diff --git a/patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch b/patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch
index e726be5..f6fd6f7 100644
--- a/patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch
+++ b/patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch
@@ -1,7 +1,7 @@
-From 98695ce56229f55bd5c5bc4856f105d6f02d2ebf Mon Sep 17 00:00:00 2001
+From 5ce3705dec69f9b26d5e6b9d97c5acef6937c1f3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:47:52 +0200
-Subject: [PATCH 13/21] Reenable STRATEGY_ROUTING. This is a leftover of tries
+Subject: [PATCH 13/23] Reenable STRATEGY_ROUTING. This is a leftover of tries
  of 587b198, wrongly commited in 20f869
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch b/patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch
index 6dbe2f7..11a6179 100644
--- a/patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch
+++ b/patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch
@@ -1,7 +1,7 @@
-From 073d71259db702ec3bc4fa1f46a8c4e41a0ed776 Mon Sep 17 00:00:00 2001
+From 49b6a945b6f71d4c29241f749f605a851d7bd9b2 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 14:48:49 +0200
-Subject: [PATCH 14/21] Use a fake volume policy when none has been found
+Subject: [PATCH 14/23] Use a fake volume policy when none has been found
 
 This is useful, because on Samsung devices, the "real"
 (=non-gsi-cheating) audio policy doesn't have any volume policy.
diff --git a/patches_treble_phh/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch b/patches_treble_phh/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
index 25ae2fc..c774adc 100644
--- a/patches_treble_phh/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
+++ b/patches_treble_phh/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
@@ -1,7 +1,7 @@
-From 9a975152664ef309b06f1de15947a0dec2489376 Mon Sep 17 00:00:00 2001
+From c8f0ce02deeeb8d126b832f929e1ead7f1f567bf Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 28 Mar 2021 18:54:47 +0200
-Subject: [PATCH 15/21] Not all sources in a route are valid. Dont ignore the
+Subject: [PATCH 15/23] Not all sources in a route are valid. Dont ignore the
  whole route because of one broken source
 
 Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d
diff --git a/patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch b/patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch
index 4d14dae..f55665a 100644
--- a/patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch
+++ b/patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch
@@ -1,7 +1,7 @@
-From 7a4aca68a3a50e50518abed26c09253b273736de Mon Sep 17 00:00:00 2001
+From a04258dd8d53e6788f00ec2af118edef4e5bffae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 7 Aug 2021 11:11:39 +0200
-Subject: [PATCH 16/21] When aux cameras are enabled, ignore "system only"
+Subject: [PATCH 16/23] When aux cameras are enabled, ignore "system only"
  camera flag (it shouldnt be q security issue since secure cameras are listed
  otherwise)
 
diff --git a/patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch b/patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch
index cc75b88..026fa7b 100644
--- a/patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch
+++ b/patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch
@@ -1,7 +1,7 @@
-From 0a0c33fe70c18a9b73925971ba0a67afe07d67da Mon Sep 17 00:00:00 2001
+From cfc70e827ca50d56fbac1b4a334fad77acdf82a4 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Tue, 19 Oct 2021 21:16:55 -0400
-Subject: [PATCH 17/21] APM: Restore R and Q behavior respectively for
+Subject: [PATCH 17/23] APM: Restore R and Q behavior respectively for
  telephony audio
 
 This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the
diff --git a/patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch b/patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
index 7a27b3f..f57a19e 100644
--- a/patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
+++ b/patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
@@ -1,7 +1,7 @@
-From 9f79402919068f9aaf1f2c47a82fd3845a35dfa2 Mon Sep 17 00:00:00 2001
+From ddf03b6aeaa7d11294c4ab404d5cd50ba74cd966 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 11 Oct 2021 16:10:42 -0400
-Subject: [PATCH 18/21] Revert "Remove support for audio HAL V2 from the
+Subject: [PATCH 18/23] Revert "Remove support for audio HAL V2 from the
  framework"
 
 This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.
diff --git a/patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch b/patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch
index 0d62a80..761564a 100644
--- a/patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch
+++ b/patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch
@@ -1,7 +1,7 @@
-From d71c81ad6d3b5ab54212e281c9efeab3cb4711be Mon Sep 17 00:00:00 2001
+From 5dbb242d7d2435fab6346515b723fd197331e16a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 30 Jan 2022 07:40:19 -0500
-Subject: [PATCH 19/21] Fix parsing audio hal 7.0 audio policies
+Subject: [PATCH 19/23] Fix parsing audio hal 7.0 audio policies
 
 Google changed separator from natural "," to weird " "
 We broke its support in "FIH devices: Fix "Earpiece" audio output"
diff --git a/patches_treble_phh/platform_frameworks_av/0020-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch b/patches_treble_phh/platform_frameworks_av/0020-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch
index deec0cb..f0bf733 100644
--- a/patches_treble_phh/platform_frameworks_av/0020-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch
+++ b/patches_treble_phh/platform_frameworks_av/0020-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch
@@ -1,7 +1,7 @@
-From f9496b5e570c38233be509c4b14bd0e0f36518ef Mon Sep 17 00:00:00 2001
+From 84a17a2c0cd0ff029e62b8c8b0d66cbabcc20878 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 12 Mar 2022 18:07:43 -0500
-Subject: [PATCH 20/21] fixup! Not all sources in a route are valid. Dont
+Subject: [PATCH 20/23] fixup! Not all sources in a route are valid. Dont
  ignore the whole route because of one broken source
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_av/0021-Next-level-of-force-disable-a2dp-offload-erase-all-m.patch b/patches_treble_phh/platform_frameworks_av/0021-Next-level-of-force-disable-a2dp-offload-erase-all-m.patch
index ff163a5..87034f1 100644
--- a/patches_treble_phh/platform_frameworks_av/0021-Next-level-of-force-disable-a2dp-offload-erase-all-m.patch
+++ b/patches_treble_phh/platform_frameworks_av/0021-Next-level-of-force-disable-a2dp-offload-erase-all-m.patch
@@ -1,7 +1,7 @@
-From 614970eca688faf496cee321f1bed312a0773c8d Mon Sep 17 00:00:00 2001
+From a4877baf04cab3ea39e6cfb07dca5f192c00b4c6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Apr 2022 15:07:37 -0400
-Subject: [PATCH 21/21] Next level of force disable a2dp offload: erase all
+Subject: [PATCH 21/23] Next level of force disable a2dp offload: erase all
  modules related to a2dp, and include our own
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_av/0022-Add-a-prop-to-change-Samsung-flash-strength.patch b/patches_treble_phh/platform_frameworks_av/0022-Add-a-prop-to-change-Samsung-flash-strength.patch
new file mode 100644
index 0000000..88c759c
--- /dev/null
+++ b/patches_treble_phh/platform_frameworks_av/0022-Add-a-prop-to-change-Samsung-flash-strength.patch
@@ -0,0 +1,57 @@
+From d51bb9caf00ae2736c1d2376688cbb5d273acc34 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sat, 16 Apr 2022 14:30:14 -0400
+Subject: [PATCH 22/23] Add a prop to change Samsung flash strength
+
+---
+ services/camera/libcameraservice/Android.bp        |  1 +
+ .../common/CameraProviderManager.cpp               | 14 +++++++++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
+index a2a2ad623e..b616f8207f 100644
+--- a/services/camera/libcameraservice/Android.bp
++++ b/services/camera/libcameraservice/Android.bp
+@@ -156,6 +156,7 @@ cc_library_shared {
+         "android.hardware.camera.device@3.7",
+         "vendor.samsung.hardware.camera.provider@3.0",
+         "vendor.samsung.hardware.camera.provider@4.0",
++        "vendor.samsung.hardware.camera.device@5.0",
+         "media_permission-aidl-cpp",
+     ],
+ 
+diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
+index 9d26bd44d7..4577337fd2 100644
+--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
++++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
+@@ -23,6 +23,7 @@
+ #include <android/hardware/camera/device/3.7/ICameraDevice.h>
+ #include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
+ #include <vendor/samsung/hardware/camera/provider/4.0/ISehCameraProvider.h>
++#include <vendor/samsung/hardware/camera/device/5.0/ISehCameraDevice.h>
+ 
+ #include <algorithm>
+ #include <chrono>
+@@ -2289,7 +2290,18 @@ sp<InterfaceT> CameraProviderManager::ProviderInfo::DeviceInfo::startDeviceInter
+ template<class InterfaceT>
+ status_t CameraProviderManager::ProviderInfo::DeviceInfo::setTorchMode(InterfaceT& interface,
+         bool enabled) {
+-    Status s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
++    int32_t flashStrength = property_get_int32("persist.sys.phh.flash_strength", 1);
++
++    auto sehCast = vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice::castFrom(interface);
++    android::sp<vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice> seh = sehCast;
++
++    Status s;
++    if(seh != nullptr) {
++        s = seh->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
++    } else {
++        s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
++    }
++
+     return mapToStatusT(s);
+ }
+ 
+-- 
+2.25.1
+
diff --git a/patches_treble_phh/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch b/patches_treble_phh/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch
new file mode 100644
index 0000000..e287e8e
--- /dev/null
+++ b/patches_treble_phh/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch
@@ -0,0 +1,52 @@
+From 4e0112f9890f03418d16d999a01298728f3445d9 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 2 May 2022 17:37:09 -0400
+Subject: [PATCH 23/23] Support variable flash strength on samsung hal 4.0
+
+---
+ services/camera/libcameraservice/Android.bp                 | 1 +
+ .../libcameraservice/common/CameraProviderManager.cpp       | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
+index b616f8207f..3b99e643e5 100644
+--- a/services/camera/libcameraservice/Android.bp
++++ b/services/camera/libcameraservice/Android.bp
+@@ -157,6 +157,7 @@ cc_library_shared {
+         "vendor.samsung.hardware.camera.provider@3.0",
+         "vendor.samsung.hardware.camera.provider@4.0",
+         "vendor.samsung.hardware.camera.device@5.0",
++        "vendor.samsung.hardware.camera.device@4.0",
+         "media_permission-aidl-cpp",
+     ],
+ 
+diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
+index 4577337fd2..8b483a55c8 100644
+--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
++++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
+@@ -24,6 +24,7 @@
+ #include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
+ #include <vendor/samsung/hardware/camera/provider/4.0/ISehCameraProvider.h>
+ #include <vendor/samsung/hardware/camera/device/5.0/ISehCameraDevice.h>
++#include <vendor/samsung/hardware/camera/device/4.0/ISehCameraDevice.h>
+ 
+ #include <algorithm>
+ #include <chrono>
+@@ -2295,9 +2296,14 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo::setTorchMode(Interface
+     auto sehCast = vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice::castFrom(interface);
+     android::sp<vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice> seh = sehCast;
+ 
++    auto sehCast2 = vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice::castFrom(interface);
++    android::sp<vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice> seh2 = sehCast2;
++
+     Status s;
+     if(seh != nullptr) {
+         s = seh->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
++    } else if(seh2 != nullptr) {
++        s = seh2->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
+     } else {
+         s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
+     }
+-- 
+2.25.1
+
diff --git a/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
index d18e941..4f2f657 100644
--- a/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
+++ b/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
@@ -1,7 +1,7 @@
-From 5675af56cab31009b7e40c33c0974e3155b7e132 Mon Sep 17 00:00:00 2001
+From 50894d0b194706219e869070d0d0a60c2fedbd83 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 5 Oct 2021 17:59:16 -0400
-Subject: [PATCH 01/31] Fallback to stupid autobrightness if brightness values
+Subject: [PATCH 01/33] Fallback to stupid autobrightness if brightness values
  are broken
 
 This is needed because of:
diff --git a/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
index ea1045e..27446e7 100644
--- a/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ b/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
@@ -1,7 +1,7 @@
-From 052ace3bdbe81360770e85176996525ea7665861 Mon Sep 17 00:00:00 2001
+From 01d72f3de8dd8e1a4671d4a1f1d5bbab9241194a Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH 02/31] Relax requirement for visible flag to sdcards
+Subject: [PATCH 02/33] Relax requirement for visible flag to sdcards
 
 The vast majority of sdcard readers are stable enough to be declared by
 the API. (I see no counter-example)
@@ -13,10 +13,10 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index 2f29c3cb4e7c..de92ad4d47ca 100644
+index ec58b1701694..40b9a18f0fb3 100644
 --- a/services/core/java/com/android/server/StorageManagerService.java
 +++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1582,7 +1582,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1583,7 +1583,8 @@ class StorageManagerService extends IStorageManager.Stub
  
              // Adoptable public disks are visible to apps, since they meet
              // public API requirement of being in a stable location.
diff --git a/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
index 4673ee9..ca40398 100644
--- a/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ b/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
@@ -1,7 +1,7 @@
-From 29116da26af1af6c2b8b929b85261e6a23b68807 Mon Sep 17 00:00:00 2001
+From cb46b9da6a63fe5cb89348c03e707fc43981a465 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 17 May 2018 20:28:35 +0200
-Subject: [PATCH 03/31] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 03/33] Don't crash if there is IR HAL is not declared
 
 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch b/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch
index dbfd264..cb1ce39 100644
--- a/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch
+++ b/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch
@@ -1,7 +1,7 @@
-From f2300a6714aeffaba7f423f76b93f2dbb06148a7 Mon Sep 17 00:00:00 2001
+From f3f8c69914b7c20bac11c3fb0a217ced1944901e Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 6 Aug 2018 12:49:00 +0200
-Subject: [PATCH 04/31] Show APN Settings for CDMA carriers
+Subject: [PATCH 04/33] Show APN Settings for CDMA carriers
 
 ---
  telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
diff --git a/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch
index d998ced..1cc55e7 100644
--- a/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch
+++ b/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch
@@ -1,7 +1,7 @@
-From 4c4035881ae7e213433b0fc5c9c8582269302954 Mon Sep 17 00:00:00 2001
+From c441a4d08d3226a89f5a9d5d54a3e092bc398bc3 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 8 Nov 2018 23:04:03 +0100
-Subject: [PATCH 05/31] Re-order services so that it works even without qtaguid
+Subject: [PATCH 05/33] Re-order services so that it works even without qtaguid
 
 Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch b/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch
index 80bbca3..1f2bd16 100644
--- a/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch
+++ b/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch
@@ -1,7 +1,7 @@
-From 751f7e0840e5f27750a81efe9f94f6c0b484b8e5 Mon Sep 17 00:00:00 2001
+From cdf6204270d189dc035fee8f21b4f73697eaa711 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 24 Mar 2019 23:05:14 +0100
-Subject: [PATCH 06/31] Support samsung Pie and Q light hal
+Subject: [PATCH 06/33] Support samsung Pie and Q light hal
 
 Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch
index 77aae9f..55c7417 100644
--- a/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch
+++ b/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch
@@ -1,7 +1,7 @@
-From ed9809bbd9fe4936094d680def1efdee23f9b6b3 Mon Sep 17 00:00:00 2001
+From c2c21c01856fc410d196633429f22535957a0d0f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 12 Aug 2019 23:08:26 +0200
-Subject: [PATCH 07/31] Add support for samsung touch, physical and hover
+Subject: [PATCH 07/33] Add support for samsung touch, physical and hover
  proximity sensor as fallback to real proximity sensor
 
 Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
@@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
  1 file changed, 35 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 78d79ad2f12d..1bcd2317235b 100644
+index 171fdfa5ca6d..abf4d20a1cf5 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -1734,6 +1734,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1744,6 +1744,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                  ? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK;
          mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,
                  fallbackType);
@@ -41,7 +41,7 @@ index 78d79ad2f12d..1bcd2317235b 100644
          if (mProximitySensor != null) {
              mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                      TYPICAL_PROXIMITY_THRESHOLD);
-@@ -2499,6 +2520,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -2516,6 +2537,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          public void onSensorChanged(SensorEvent event) {
              if (mProximitySensorEnabled) {
                  final long time = SystemClock.uptimeMillis();
diff --git a/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch b/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch
index 9b32461..eab0d90 100644
--- a/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch
+++ b/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch
@@ -1,7 +1,7 @@
-From b9f801be0142d92b448b2ec91fb4dafb4856791d Mon Sep 17 00:00:00 2001
+From 0e304464a29e1905e64bceb63638b1a946d80720 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 5 Apr 2020 16:32:46 +0200
-Subject: [PATCH 08/31] Always allow overriding the number of work profiles
+Subject: [PATCH 08/33] Always allow overriding the number of work profiles
 
 Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
index ae31c82..e9edca1 100644
--- a/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
+++ b/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
@@ -1,7 +1,7 @@
-From 8c3d4fcea46de7a0b83df0ae238b09af870bbb1f Mon Sep 17 00:00:00 2001
+From 1e97292318d9af4b29d450f819f1f954232473d7 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 6 Jun 2020 18:21:56 +0200
-Subject: [PATCH 09/31] HOME deserves to wake-up devices just as well as back
+Subject: [PATCH 09/33] HOME deserves to wake-up devices just as well as back
  and menu
 
 Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
diff --git a/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch b/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
index 8a0b392..5fcac64 100644
--- a/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
+++ b/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
@@ -1,7 +1,7 @@
-From 0c03c7a32ba5cadf840e8c599df83486a75c8cca Mon Sep 17 00:00:00 2001
+From 26b1e0b7a9dd7f289d297c3af395d997efa8d4d1 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:39:47 +0200
-Subject: [PATCH 10/31] Some devices have proximity sensor reporting NaN as max
+Subject: [PATCH 10/33] Some devices have proximity sensor reporting NaN as max
  range for some reason. Make them behave standard way by setting 5 cm
 
 Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
@@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
  1 file changed, 3 insertions(+)
 
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 1bcd2317235b..0d5ea94da738 100644
+index abf4d20a1cf5..5f7fd1b23df4 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -1758,6 +1758,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1768,6 +1768,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          if (mProximitySensor != null) {
              mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
                      TYPICAL_PROXIMITY_THRESHOLD);
diff --git a/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
index ba4dd91..2a46d16 100644
--- a/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
+++ b/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
@@ -1,7 +1,7 @@
-From 356f356b5d061a6977e3a6d64d8b1220311b097d Mon Sep 17 00:00:00 2001
+From e0837f217283c60aff22b83e43823e1411b05428 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 29 Sep 2020 22:40:10 +0200
-Subject: [PATCH 11/31] Fix brightness range not being complete on Samsung
+Subject: [PATCH 11/33] Fix brightness range not being complete on Samsung
  devices
 
 On some devices, minimum brightness is 0, which totally messes with
diff --git a/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
index 39012cd..52cc718 100644
--- a/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
+++ b/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
@@ -1,7 +1,7 @@
-From 30377055985ef3caec0085e8283200bbe106b3f8 Mon Sep 17 00:00:00 2001
+From 1b94ddc6fc561f136a7e73d06b5dcdb674700270 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 25 Oct 2020 23:57:26 +0100
-Subject: [PATCH 12/31] Re-implement fnmatch-like behaviour for RRO java-side
+Subject: [PATCH 12/33] Re-implement fnmatch-like behaviour for RRO java-side
 
 Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch b/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch
index 5feec9c..62fa232 100644
--- a/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch
+++ b/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch
@@ -1,7 +1,7 @@
-From efa47ee9932c87edea2f8dcb26426303c86d9a16 Mon Sep 17 00:00:00 2001
+From 1d4a485384d3089b720ef47f8941fa2a7fae4708 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 6 Dec 2020 12:20:08 +0100
-Subject: [PATCH 13/31] Make rounded corners padding overridable with
+Subject: [PATCH 13/33] Make rounded corners padding overridable with
  persist.sys.phh.rounded_corners_padding
 
 Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
diff --git a/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch b/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch
index 56b522e..571789e 100644
--- a/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch
+++ b/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch
@@ -1,7 +1,7 @@
-From 247a4b977e1eca76e70017b0865d6658998fa713 Mon Sep 17 00:00:00 2001
+From 2d0bba690d67b91bf1fd6b73eade6200c131daa8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 11 Dec 2020 14:41:09 +0100
-Subject: [PATCH 14/31] Remove useless notification about "console" service
+Subject: [PATCH 14/33] Remove useless notification about "console" service
  being running
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch b/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch
index ae13d26..b5cedfa 100644
--- a/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch
+++ b/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch
@@ -1,7 +1,7 @@
-From ca9586284beee6dbabab01517f6d0b40147d5174 Mon Sep 17 00:00:00 2001
+From a6a8d7d07f710e3156ef1b3143834b23eda0e3b3 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:24:12 +0800
-Subject: [PATCH 15/31] Revert "Remove unused SystemProperties.set"
+Subject: [PATCH 15/33] Revert "Remove unused SystemProperties.set"
 
 This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
 
diff --git a/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch b/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch
index 9442b0e..8cdb08f 100644
--- a/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch
+++ b/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch
@@ -1,7 +1,7 @@
-From 947fd7c3edd2e182f107069edc99a109a910d04f Mon Sep 17 00:00:00 2001
+From f18c5862688e3875aab0144c6d657708470175b9 Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 13:46:15 +0800
-Subject: [PATCH 16/31] TelephonyManager: bring back getNetworkClass()
+Subject: [PATCH 16/33] TelephonyManager: bring back getNetworkClass()
 
 This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
 
diff --git a/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch
index c367f62..20086bd 100644
--- a/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch
+++ b/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch
@@ -1,7 +1,7 @@
-From 6ca147c2c8bfdaa87355f78f37572b1671994371 Mon Sep 17 00:00:00 2001
+From 5a73b02dbc2b956482709865dd6e2140496a669b Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 16 Dec 2020 21:26:45 +0800
-Subject: [PATCH 17/31] TelephonyManager: add API annotations for
+Subject: [PATCH 17/33] TelephonyManager: add API annotations for
  setTelephonyProperty
 
 * This method was added back by reverting commit
diff --git a/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch b/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch
index 8fa1bb5..477651b 100644
--- a/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch
+++ b/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch
@@ -1,7 +1,7 @@
-From f98dde9d6af10f2990a0433662485eeb385f211d Mon Sep 17 00:00:00 2001
+From fd7520b8edfd852c64867282e0d12f8b4cbc33b1 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 2 Feb 2021 10:20:51 +0000
-Subject: [PATCH 18/31] Fix Wakelock issue
+Subject: [PATCH 18/33] Fix Wakelock issue
 
 Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
index 72659cd..31e6e9e 100644
--- a/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
+++ b/patches_treble_phh/platform_frameworks_base/0019-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
@@ -1,7 +1,7 @@
-From d5649f36686e27f8e94c3ebf1478bfa09d669f8f Mon Sep 17 00:00:00 2001
+From 84b5f050a8fe593d4c285014c0b39dcb3b76b2af Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 20 Mar 2021 14:31:01 +0100
-Subject: [PATCH 19/31] Automatically detect pick up sensor, so that an overlay
+Subject: [PATCH 19/33] Automatically detect pick up sensor, so that an overlay
  is required for the sole purpose of enabling pulse doze on pick up sensor
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
index ed4f6e4..b468a84 100644
--- a/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
+++ b/patches_treble_phh/platform_frameworks_base/0020-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
@@ -1,7 +1,7 @@
-From e484e2ece36778057bb70c446ca3ac2e5eaac98d Mon Sep 17 00:00:00 2001
+From 323b26d91a1ee03a7cb5d80bf3d678b4a07d1d1c Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 23 Mar 2021 19:43:26 +0100
-Subject: [PATCH 20/31] Catch broken mainBuiltInDisplayCutoutRectApproximation
+Subject: [PATCH 20/33] Catch broken mainBuiltInDisplayCutoutRectApproximation
 
 Some devices (Redmi Note 9T) have:
 mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
diff --git a/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch
index abb5bb2..fef081d 100644
--- a/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches_treble_phh/platform_frameworks_base/0021-backlight-Fix-backlight-control-on-Galaxy-S9.patch
@@ -1,7 +1,7 @@
-From d55afdade8ce3c1c5368929af4dd71aad3555174 Mon Sep 17 00:00:00 2001
+From 82d865e76a3d19d9cc2749bc4d4ea444f526d6ca Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 21/31] backlight: Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 21/33] backlight: Fix backlight control on Galaxy S9(+)
 
 Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
 
diff --git a/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch b/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch
index 302f7b0..7263b6c 100644
--- a/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch
+++ b/patches_treble_phh/platform_frameworks_base/0022-Add-support-for-app-signature-spoofing.patch
@@ -1,7 +1,7 @@
-From e04878670b5c3bfffd2991fa4501b08eb5516636 Mon Sep 17 00:00:00 2001
+From f20085c942cc67e25ee5f14e9b4f350b03e6ef87 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
-Subject: [PATCH 22/31] Add support for app signature spoofing
+Subject: [PATCH 22/33] Add support for app signature spoofing
 
 This is needed by microG GmsCore to pretend to be the official Google
 Play Services package, because client apps check the package signature
diff --git a/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch
index 0c1a666..f27a50f 100644
--- a/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch
+++ b/patches_treble_phh/platform_frameworks_base/0023-Revert-Switch-long-press-power-behavior-in-AOSP.patch
@@ -1,7 +1,7 @@
-From 94c1a67546b3487b2dea4cdc136d9d019d7192db Mon Sep 17 00:00:00 2001
+From c9dbe8146db94cd49c6a7034b57dbc70bb90e46d Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 4 Sep 2021 08:26:30 +0000
-Subject: [PATCH 23/31] Revert "Switch long-press power behavior in AOSP."
+Subject: [PATCH 23/33] Revert "Switch long-press power behavior in AOSP."
 
 This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch b/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
index 0b0fb6c..a9c989b 100644
--- a/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
+++ b/patches_treble_phh/platform_frameworks_base/0024-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
@@ -1,7 +1,7 @@
-From f029bf72a4fbb195363d841c58d55f9613335328 Mon Sep 17 00:00:00 2001
+From fecdff7eb4527d68556c283bfb6fc214f0987e83 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 17 Dec 2021 17:16:14 -0500
-Subject: [PATCH 24/31] Reduce the size of udfps enroll progress bar. Some
+Subject: [PATCH 24/33] Reduce the size of udfps enroll progress bar. Some
  devices have their udfps pretty low, and the progress bar would make the icon
  at the wrong place
 
diff --git a/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch b/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch
index bf2f85e..8b2b9b4 100644
--- a/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch
+++ b/patches_treble_phh/platform_frameworks_base/0025-Add-UDFPS-support-for-various-devices.patch
@@ -1,7 +1,7 @@
-From 7a65fc6e04b4dc686c67073eb73fe35a1c93ef90 Mon Sep 17 00:00:00 2001
+From c0a26634b7f0c7803be78afda76ba35b61d6f5dc Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sun, 19 Dec 2021 17:08:22 -0500
-Subject: [PATCH 25/31] Add UDFPS support for various devices
+Subject: [PATCH 25/33] Add UDFPS support for various devices
 
 Successfully tested on Galaxy A51, Xiaomi Mi 9, and OnePlus Nord 2
 
diff --git a/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch b/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
index f7a478c..afbc8d3 100644
--- a/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
+++ b/patches_treble_phh/platform_frameworks_base/0026-Dynamically-resize-boot-animation-to-match-screen-si.patch
@@ -1,7 +1,7 @@
-From 58f189bc4c81f2e45b8434e71674455ed6456553 Mon Sep 17 00:00:00 2001
+From fed8b0ec9d0e831ae4ce7c4236d98576fe023148 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Dec 2021 15:01:41 -0500
-Subject: [PATCH 26/31] Dynamically resize boot animation to match screen size
+Subject: [PATCH 26/33] Dynamically resize boot animation to match screen size
 
 Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch b/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
index 60e68e0..cb7ce2b 100644
--- a/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
+++ b/patches_treble_phh/platform_frameworks_base/0027-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
@@ -1,7 +1,7 @@
-From 7871552e0324ce0fb980d670282c163d88ec3303 Mon Sep 17 00:00:00 2001
+From 7866d0de9feb99616ce229e923541bd8928d01d6 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 27 Dec 2021 17:57:11 -0500
-Subject: [PATCH 27/31] Once we integrate Samsung Power hal in libpowermanager,
+Subject: [PATCH 27/33] Once we integrate Samsung Power hal in libpowermanager,
  libpowermanager and its deps require linking against
  vendor.samsung.hardware.miscpower@2.0
 
diff --git a/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch b/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch
index 0d457e8..708a6b5 100644
--- a/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch
+++ b/patches_treble_phh/platform_frameworks_base/0028-Add-persist.sys.phh.ultrasonic_udfps-property-to-dis.patch
@@ -1,7 +1,7 @@
-From 250a08142fc0bbe96622346f12dafb003fc10123 Mon Sep 17 00:00:00 2001
+From 36ba1df150d83e6967e66b45d82564fae7016f5f Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 3 Mar 2022 09:15:32 -0500
-Subject: [PATCH 28/31] Add persist.sys.phh.ultrasonic_udfps property to
+Subject: [PATCH 28/33] Add persist.sys.phh.ultrasonic_udfps property to
  disable green circle for udfps
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch b/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch
index 0ab5ae3..8a372e6 100644
--- a/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch
+++ b/patches_treble_phh/platform_frameworks_base/0029-Allow-128bits-SHA1-IPSec-keys.-This-is-required-to-i.patch
@@ -1,7 +1,7 @@
-From 983dbb48d5f5d20c1bb53dc4b5d4afe735f680c9 Mon Sep 17 00:00:00 2001
+From b704b4313ed6157ed22d134a65acd6444e5b4ac8 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Thu, 3 Mar 2022 09:17:17 -0500
-Subject: [PATCH 29/31] Allow 128bits SHA1 IPSec keys. This is required to
+Subject: [PATCH 29/33] Allow 128bits SHA1 IPSec keys. This is required to
  implement VoLTE with this API
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch b/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch
index 6d45376..4a93583 100644
--- a/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch
+++ b/patches_treble_phh/platform_frameworks_base/0030-Fix-FOD-on-ZF8.patch
@@ -1,7 +1,7 @@
-From eb66d314f14eb35e10d796886fc50f3d6a0cdbc0 Mon Sep 17 00:00:00 2001
+From 0d1dd110b3668b355c6da4dcbc74816786cc02ec Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Fri, 4 Mar 2022 19:26:53 -0500
-Subject: [PATCH 30/31] Fix FOD on ZF8
+Subject: [PATCH 30/33] Fix FOD on ZF8
 
 Goodix HAL expects events in this order:
 - Fingerprint down when touchscreen says fp down
diff --git a/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch b/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
index 4566117..89ff33e 100644
--- a/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
+++ b/patches_treble_phh/platform_frameworks_base/0031-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
@@ -1,7 +1,7 @@
-From e5999473443fc20611760aaf3098035845e7ec68 Mon Sep 17 00:00:00 2001
+From d598259994a1a283acf0605f63f0891765efbe57 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Sat, 2 Apr 2022 18:04:01 -0400
-Subject: [PATCH 31/31] Allow disabling of fingerprint cleanups, needed on some
+Subject: [PATCH 31/33] Allow disabling of fingerprint cleanups, needed on some
  Realme devices that cant enumerate
 
 ---
diff --git a/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch b/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch
new file mode 100644
index 0000000..104b7f7
--- /dev/null
+++ b/patches_treble_phh/platform_frameworks_base/0032-Switch-FOD-to-WHITE.patch
@@ -0,0 +1,25 @@
+From 779a85d010dfef34500e3f1e35513d87fedc6073 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 2 May 2022 18:02:25 -0400
+Subject: [PATCH 32/33] Switch FOD to WHITE
+
+---
+ .../src/com/android/systemui/biometrics/UdfpsSurfaceView.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+index 51409b9c533a..77fad35d32d4 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
++++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+@@ -69,7 +69,7 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb
+ 
+         mSensorPaint = new Paint(0 /* flags */);
+         mSensorPaint.setAntiAlias(true);
+-        mSensorPaint.setARGB(255, 0, 255, 0);
++        mSensorPaint.setARGB(255, 255, 255, 255);
+         mSensorPaint.setStyle(Paint.Style.FILL);
+     }
+ 
+-- 
+2.25.1
+
diff --git a/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch b/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch
new file mode 100644
index 0000000..e5f35c5
--- /dev/null
+++ b/patches_treble_phh/platform_frameworks_base/0033-Support-samsung-ultrasonic-udfps.patch
@@ -0,0 +1,83 @@
+From a0dff1c926402da7b867d7d96ce596439d94023c Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 2 May 2022 18:02:40 -0400
+Subject: [PATCH 33/33] Support samsung ultrasonic udfps
+
+---
+ .../systemui/biometrics/UdfpsView.java        |  4 +++-
+ .../sensors/fingerprint/UdfpsHelper.java      | 23 +++++++++++++++++++
+ 2 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
+index 7b8a5995f26c..7c55faa4b094 100644
+--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
++++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
+@@ -65,7 +65,7 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin
+     @NonNull private final Paint mDebugTextPaint;
+     private final float mSensorTouchAreaCoefficient;
+     private final int mOnIlluminatedDelayMs;
+-    private final @HbmType int mHbmType;
++    private @HbmType int mHbmType;
+ 
+     // Only used for UdfpsHbmTypes.GLOBAL_HBM.
+     @Nullable private UdfpsSurfaceView mGhbmView;
+@@ -151,6 +151,8 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin
+                     SETTING_HBM_TYPE, DEFAULT_HBM_TYPE, UserHandle.USER_CURRENT);
+         } else {
+             mHbmType = DEFAULT_HBM_TYPE;
++            if(android.os.SystemProperties.getBoolean("persist.sys.phh.ultrasonic_udfps", false))
++                mHbmType = UdfpsHbmTypes.LOCAL_HBM;
+         }
+     }
+ 
+diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java
+index e97f70d7bffd..8e99392cf545 100644
+--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java
++++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java
+@@ -24,6 +24,7 @@ import android.os.RemoteException;
+ import android.util.Slog;
+ 
+ import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon;
++import vendor.samsung.hardware.biometrics.fingerprint.V3_0.ISehBiometricsFingerprint;
+ 
+ import java.io.PrintWriter;
+ 
+@@ -59,6 +60,17 @@ public class UdfpsHelper {
+             }
+         }
+ 
++        try {
++            if("true".equals(android.os.SystemProperties.get("persist.sys.phh.ultrasonic_udfps"))) {
++                Slog.e(TAG, "trying ultrasonic samsung pressed");
++                ISehBiometricsFingerprint fp = ISehBiometricsFingerprint.getService();
++                fp.sehRequest(22 /* SEM_FINGER_STATE */, 2 /* finger pressed */, new java.util.ArrayList<Byte>(),
++                        (int retval, java.util.ArrayList<Byte> out) -> {} );
++            }
++        } catch(Throwable t) {
++            Slog.e(TAG, "Tried sending Samsung command failed");
++        }
++
+         try {
+             // Asus goodix commands
+             IGoodixFingerprintDaemon goodixDaemon = IGoodixFingerprintDaemon.getService();
+@@ -114,6 +126,17 @@ public class UdfpsHelper {
+             }
+         }
+ 
++        try {
++            if("true".equals(android.os.SystemProperties.get("persist.sys.phh.ultrasonic_udfps"))) {
++                Slog.e(TAG, "trying ultrasonic samsung released");
++                ISehBiometricsFingerprint fp = ISehBiometricsFingerprint.getService();
++                fp.sehRequest(22 /* SEM_FINGER_STATE */, 1 /* finger pressed */, new java.util.ArrayList<Byte>(),
++                        (int retval, java.util.ArrayList<Byte> out) -> {} );
++            }
++        } catch(Throwable t) {
++            Slog.e(TAG, "Tried sending Samsung command failed");
++        }
++
+         try {
+             IGoodixFingerprintDaemon goodixDaemon = IGoodixFingerprintDaemon.getService();
+             if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
+-- 
+2.25.1
+
diff --git a/patches_treble_phh/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch b/patches_treble_phh/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
index 14fe3bd..3160ec4 100644
--- a/patches_treble_phh/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
+++ b/patches_treble_phh/platform_packages_apps_Settings/0001-Act-as-usb-device-when-there-is-no-hal-but-we-believ.patch
@@ -1,8 +1,8 @@
-From e5a3d5022cac5006195485aca93bc621b6a68473 Mon Sep 17 00:00:00 2001
+From 61dc02d02befdac9aa545ce6908403cffddd3a9b Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 21:48:19 +0200
-Subject: [PATCH] Act as usb device when there is no hal, but we believe we are
- a device
+Subject: [PATCH 1/2] Act as usb device when there is no hal, but we believe we
+ are a device
 
 Change-Id: I036090738525fd8cc63534d52d02ab1852950a7d
 ---
@@ -28,5 +28,5 @@ index c5bcbed00c..77b6148fa6 100644
              UsbPortStatus portStatus = intent.getExtras()
                      .getParcelable(UsbManager.EXTRA_PORT_STATUS);
 -- 
-2.29.2
+2.25.1
 
diff --git a/patches_treble_phh/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch b/patches_treble_phh/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
new file mode 100644
index 0000000..80481b0
--- /dev/null
+++ b/patches_treble_phh/platform_packages_apps_Settings/0002-Ignore-cancelled-fingerprint-events-they-are-expecte.patch
@@ -0,0 +1,40 @@
+From d33a798a4a8143e1fc6e78459bbcce47f32b8174 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 2 May 2022 17:44:28 -0400
+Subject: [PATCH 2/2] Ignore cancelled fingerprint events, they are expected,
+ plus add more fingerprint enroll logs
+
+---
+ .../biometrics/fingerprint/FingerprintEnrollEnrolling.java     | 3 +++
+ .../biometrics/fingerprint/FingerprintEnrollFindSensor.java    | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+index 1a83da567c..f85666063a 100644
+--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
++++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+@@ -436,6 +436,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
+ 
+     @Override
+     public void onEnrollmentError(int errMsgId, CharSequence errString) {
++	android.util.Log.e("PHH-Enroll", "heyo " + errMsgId + ", " + errString , new Exception());
++	if (errMsgId == 5) return;
++
+         FingerprintErrorDialog.showErrorDialog(this, errMsgId);
+         stopIconAnimation();
+         if (!mCanAssumeUdfps) {
+diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+index 87ce623f9b..f0eeae2fa8 100644
+--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
++++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+@@ -210,6 +210,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
+ 
+     @Override
+     public void onEnrollmentError(int errMsgId, CharSequence errString) {
++	android.util.Log.e("PHH-Enroll", "heyo " + errMsgId + ", " + errString + ", " + mNextClicked, new Exception());
+         if (mNextClicked && errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+             mNextClicked = false;
+             proceedToEnrolling(false /* cancelEnrollment */);
+-- 
+2.25.1
+