Initial unified commit for Android 13, with "light" GSI target

2022-09-28 15:49:08 +00:00 · 2022-09-28 15:49:08 +00:00 · 65d23014f6
commit 65d23014f6
83 changed files with 8544 additions and 0 deletions
--- a/patches_platform/build_make/0001-build-Remove-llkd.patch
+++ b/patches_platform/build_make/0001-build-Remove-llkd.patch
@ -0,0 +1,27 @@
+From 90eaa68455703e85c5f97d0b13945bd04351e24c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 14 Oct 2021 12:20:52 +0000
+Subject: [PATCH] build: Remove llkd
+
+...until someone figures out why Genshin Impact fails it
+
+Change-Id: I29384a820a0c07b29d3f11d7039bed40eeaee926
+---
+ target/product/base_system.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/target/product/base_system.mk b/target/product/base_system.mk
+index b5b41f3be..c18a6dc03 100644
+--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
+@@ -195,7 +195,6 @@ PRODUCT_PACKAGES += \
+     libwilhelm \
+     linker \
+     linkerconfig \
+-    llkd \
+     lmkd \
+     LocalTransport \
+     locksettings \
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
+++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
@ -0,0 +1,126 @@
+From b94084cca9202c12ea41de9f6f23785c818a64c0 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/12] Add SPenPointerOverlay
+
+Toggle this overlay with property "persist.ui.spen.pointer"
+
+Change-Id: I21f7e05cf8ebd74c950dfb20cf7eee99bfe22988
+---
+ packages/overlays/Android.mk                  |   1 +
+ .../overlays/SPenPointerOverlay/Android.bp    |  28 ++++++++++++++++++
+ .../SPenPointerOverlay/AndroidManifest.xml    |  23 ++++++++++++++
+ .../sem_pointer_spot_hovering_spen.png        | Bin 0 -> 411 bytes
+ .../res/drawable/pointer_arrow_icon.xml       |   5 ++++
+ 5 files changed, 57 insertions(+)
+ create mode 100644 packages/overlays/SPenPointerOverlay/Android.bp
+ create mode 100644 packages/overlays/SPenPointerOverlay/AndroidManifest.xml
+ create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png
+ create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
+
+diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
+index 69641e69a9f2..36ec11af3068 100644
+--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
+@@ -31,6 +31,7 @@ LOCAL_REQUIRED_MODULES := \
+ 	NavigationBarModeGesturalOverlayNarrowBack \
+ 	NavigationBarModeGesturalOverlayWideBack \
+ 	NavigationBarModeGesturalOverlayExtraWideBack \
+	SPenPointerOverlay \
+ 	preinstalled-packages-platform-overlays.xml
+ 
+ include $(BUILD_PHONY_PACKAGE)
+diff --git a/packages/overlays/SPenPointerOverlay/Android.bp b/packages/overlays/SPenPointerOverlay/Android.bp
+new file mode 100644
+index 000000000000..7632ebd43ef6
+--- /dev/null
+++ b/packages/overlays/SPenPointerOverlay/Android.bp
+@@ -0,0 +1,28 @@
+//
+//  Copyright 2021, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
+runtime_resource_overlay {
+    name: "SPenPointerOverlay",
+    product_specific: true,
+}
+diff --git a/packages/overlays/SPenPointerOverlay/AndroidManifest.xml b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml
+new file mode 100644
+index 000000000000..b785214f854b
+--- /dev/null
+++ b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml
+@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.samsung.android.spenpointer.overlay"
+        android:versionCode="1"
+        android:versionName="1.0">
+    <overlay android:targetPackage="android" android:priority="5932" android:isStatic="true"
+        android:requiredSystemPropertyName="persist.ui.spen.pointer" android:requiredSystemPropertyValue="true"/>
+</manifest>
+diff --git a/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png b/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..b73246c80a95e0bceeb8c09aacd2653722fca2d2
+GIT binary patch
+literal 411
+zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TG?EyX^u0VPYDww}y>9XB>H{O1*
+z{q+Z+%%XMcH{QCp_4%7Ek6&zi^&Z52_8N#bKYY6T$G`bYmOylGdHNEl2EyKW`#w-H
+zMEkav?|=xXa@&iyKv|#(o9;XSGJv*hefA2d9ViRrHpmHroTOV4<QL2kefT?*&XynF
+zf9jt6d~bTxr(K#H%-fm6)$T^@`96*P!_O$D=#P=#_iokL5u<mvYQ}e<#%Z1|jv*T7
+z-(HO6Z&DCpO9*-59T;HT8)CHh%)kHdv-@V7U0D0tD*XMooHrlj82&Lg8FU>wkZ<5N
+zBf!g`Yhiojq)$5MjpwPIIqY#_(VA78COitTt~#=3<I2pBClgEGRn7j@r_s({E14^`
+zzN)C=(stXhXOBPbPTyLVZ~8%?D9+x@`{Nq(tjK9wr(Jhj*%s6+*nEHflkLxVMFlvw
+UdB5Fp8R$X=Pgg&ebxsLQ0B%Ow$N&HU
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
+new file mode 100644
+index 000000000000..f35255c5f961
+--- /dev/null
+++ b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
+@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pointer-icon xmlns:android="http://schemas.android.com/apk/res/android"
+    android:bitmap="@drawable/sem_pointer_spot_hovering_spen"
+    android:hotSpotX="5dp"
+    android:hotSpotY="5dp" />
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
+++ b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
@ -0,0 +1,40 @@
+From 5d4c54f6956862135a6066f4c0e322690145cce8 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 5 Apr 2018 10:01:19 +0800
+Subject: [PATCH 02/12] Disable vendor mismatch warning
+
+Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
+---
+ .../server/wm/ActivityTaskManagerService.java    | 16 ++--------------
+ 1 file changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+index 43b66d181326..1f0d60cf3a38 100644
+--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+@@ -5696,20 +5696,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+                 }
+ 
+                 if (!Build.isBuildConsistent()) {
+-                    Slog.e(TAG, "Build fingerprint is not consistent, warning user");
+-                    mUiHandler.post(() -> {
+-                        if (mShowDialogs) {
+-                            AlertDialog d = new BaseErrorDialog(mUiContext);
+-                            d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
+-                            d.setCancelable(false);
+-                            d.setTitle(mUiContext.getText(R.string.android_system_label));
+-                            d.setMessage(mUiContext.getText(R.string.system_error_manufacturer));
+-                            d.setButton(DialogInterface.BUTTON_POSITIVE,
+-                                    mUiContext.getText(R.string.ok),
+-                                    mUiHandler.obtainMessage(DISMISS_DIALOG_UI_MSG, d));
+-                            d.show();
+-                        }
+-                    });
+                    Slog.e(TAG, "Build fingerprint is not consistent");
+                    // Do not emit warning about vendor mismatch
+                 }
+             }
+         }
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch
+++ b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch
@ -0,0 +1,62 @@
+From 4dc4d1ec5be6658812b82c09d745975674707572 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 03/12] UI: Adjust default navbar layouts
+
+- Slightly tighten nodpi layout
+- Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify
+
+Change-Id: Ia32f5d92e6c9e36560c53e7dffce7d2c29a81fe5
+---
+ .../SystemUI/res/values-sw372dp/config.xml    | 25 -------------------
+ packages/SystemUI/res/values/config.xml       |  2 +-
+ 2 files changed, 1 insertion(+), 26 deletions(-)
+ delete mode 100644 packages/SystemUI/res/values-sw372dp/config.xml
+
+diff --git a/packages/SystemUI/res/values-sw372dp/config.xml b/packages/SystemUI/res/values-sw372dp/config.xml
+deleted file mode 100644
+index 07b797a32428..000000000000
+--- a/packages/SystemUI/res/values-sw372dp/config.xml
+++ /dev/null
+@@ -1,25 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!--
+-/*
+-** Copyright 2017, 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.
+-*/
+--->
+-
+-<!-- These resources are around just to allow their values to be customized
+-     for different hardware and product builds. -->
+-<resources>
+-    <!-- Nav bar button default ordering/layout -->
+-    <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string>
+-</resources>
+diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
+index ba31e7f1f1d1..c4625e7e784d 100644
+--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
+@@ -307,7 +307,7 @@
+     </string-array>
+ 
+     <!-- Nav bar button default ordering/layout -->
+-    <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string>
+    <string name="config_navBarLayout" translatable="false">left[.6W],back[1WC];home;recent[1WC],right[.6W]</string>
+     <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;contextual[1.7WC]</string>
+     <string name="config_navBarLayoutHandle" translatable="false">back[70AC];home_handle;ime_switcher[70AC]</string>
+ 
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch
+++ b/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch
@ -0,0 +1,28 @@
+From 06c01a490bf6379a8f9d8e4e8499add7a4ea2cbc 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 04/12] UI: Disable wallpaper zoom
+
+It does little more than inducing motion sickness
+
+Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
+---
+ 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 34b5589bf81f..be2dbc3cd5dc 100644
+--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
+@@ -5029,7 +5029,7 @@
+     <item name="config_wallpaperMinScale" format="float" type="dimen">1</item>
+ 
+     <!-- The max scale for the wallpaper when it's zoomed in -->
+-    <item name="config_wallpaperMaxScale" format="float" type="dimen">1.10</item>
+    <item name="config_wallpaperMaxScale" format="float" type="dimen">1</item>
+ 
+     <!-- If true, the wallpaper will scale regardless of the value of shouldZoomOutWallpaper() -->
+     <bool name="config_alwaysScaleWallpaper">false</bool>
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch
+++ b/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch
@ -0,0 +1,39 @@
+From 202ed6730a9b3182c33ef3d5169ff026ab269a2a Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 25 Sep 2022 02:20:52 +0000
+Subject: [PATCH 05/12] UI: Follow Monet and light/dark theme in user 1 icon
+
+Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8
+---
+ core/res/res/values-night/colors.xml | 1 +
+ core/res/res/values/colors.xml       | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml
+index 33c9b95c5819..f3531caa47d9 100644
+--- a/core/res/res/values-night/colors.xml
+++ b/core/res/res/values-night/colors.xml
+@@ -33,6 +33,7 @@
+ 
+     <color name="overview_background">@color/overview_background_dark</color>
+ 
+    <color name="user_icon_1">@color/system_accent1_100</color>
+     <color name="user_icon_4">#fff439a0</color><!-- pink -->
+     <color name="user_icon_6">#ff4ecde6</color><!-- cyan -->
+     <color name="user_icon_7">#fffbbc04</color><!-- yellow -->
+diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
+index b515abc4000f..87a4bb9da02b 100644
+--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
+@@ -174,7 +174,7 @@
+     <color name="system_notification_accent_color">#00000000</color>
+ 
+     <!-- Default user icon colors -->
+-    <color name="user_icon_1">#ffe46962</color><!-- red -->
+    <color name="user_icon_1">@color/system_accent1_600</color>
+     <color name="user_icon_2">#ffaf5cf7</color><!-- purple -->
+     <color name="user_icon_3">#ff4c8df6</color><!-- blue -->
+     <color name="user_icon_4">#fff439a0</color><!-- pink -->
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch
+++ b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch
@ -0,0 +1,35 @@
+From 448d7cb6f0689082ec63820f72e8ef221154fcfd 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 06/12] UI: Increase default status bar height
+
+Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
+---
+ core/res/res/values/dimens.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
+index b754100a3ed6..1851b42c0f3b 100644
+--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
+@@ -41,7 +41,7 @@
+ 
+     <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
+          calculate the status bar height. -->
+-    <dimen name="status_bar_height_default">24dp</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+     <!-- Height of the status bar.
+          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+          -->
+@@ -49,7 +49,7 @@
+     <!-- Height of the status bar in portrait.
+          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+          -->
+-    <dimen name="status_bar_height_portrait">24dp</dimen>
+    <dimen name="status_bar_height_portrait">28dp</dimen>
+     <!-- Height of the status bar in landscape.
+          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+          -->
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch
+++ b/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch
@ -0,0 +1,25 @@
+From 057673be164d2bc9cefbe2161bb8293909e72ae6 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 25 Sep 2022 02:20:20 +0000
+Subject: [PATCH 07/12] UI: Remove QS footer background
+
+Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef
+---
+ packages/SystemUI/res-keyguard/layout/footer_actions.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
+index 876f275ab042..497181d9ee03 100644
+--- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml
+++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml
+@@ -24,7 +24,6 @@
+     android:elevation="@dimen/qs_panel_elevation"
+     android:paddingTop="8dp"
+     android:paddingBottom="@dimen/qs_footer_actions_bottom_padding"
+-    android:background="@drawable/qs_footer_actions_background"
+     android:gravity="center_vertical"
+     android:layout_gravity="bottom"
+ >
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
+++ b/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch
@ -0,0 +1,56 @@
+From e5ac2b04e10ce9b900e9a3ca0c1c609a26e4aaee 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/12] 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
+
+Change-Id: I240b627793b615c82bd07ebd77638cde180ef80f
+---
+ .../Shell/res/color/split_divider_background.xml  |  4 ++--
+ .../wm/shell/common/split/SplitLayout.java        | 15 +--------------
+ 2 files changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/libs/WindowManager/Shell/res/color/split_divider_background.xml b/libs/WindowManager/Shell/res/color/split_divider_background.xml
+index 049980803ee3..cd54ac26a7fd 100644
+--- a/libs/WindowManager/Shell/res/color/split_divider_background.xml
+++ b/libs/WindowManager/Shell/res/color/split_divider_background.xml
+@@ -15,5 +15,5 @@
+   ~ limitations under the License.
+   -->
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+-    <item android:color="@android:color/system_neutral1_500" android:lStar="15" />
+-</selector>
+\ No newline at end of file
+    <item android:color="@android:color/black" />
+</selector>
+diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
+index c94455d9151a..5eedb1fdb824 100644
+--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java
+@@ -138,20 +138,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
+     }
+ 
+     private int getDividerInsets(Resources resources, Display display) {
+-        final int dividerInset = resources.getDimensionPixelSize(
+-                com.android.internal.R.dimen.docked_stack_divider_insets);
+-
+-        int radius = 0;
+-        RoundedCorner corner = display.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT);
+-        radius = corner != null ? Math.max(radius, corner.getRadius()) : radius;
+-        corner = display.getRoundedCorner(RoundedCorner.POSITION_TOP_RIGHT);
+-        radius = corner != null ? Math.max(radius, corner.getRadius()) : radius;
+-        corner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT);
+-        radius = corner != null ? Math.max(radius, corner.getRadius()) : radius;
+-        corner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT);
+-        radius = corner != null ? Math.max(radius, corner.getRadius()) : radius;
+-
+-        return Math.max(dividerInset, radius);
+        return 0;
+     }
+ 
+     /** Gets bounds of the primary split with screen based coordinate. */
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
+++ b/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
@ -0,0 +1,64 @@
+From d9518a3ec3b88c36f16d8a7417d1d2c29bec25fc 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/12] UI: Revive navbar layout tuning via sysui_nav_bar
+ tunable
+
+Google keeps fixing what ain't broken.
+
+Change-Id: Ied7d7859e50fd0fcc346219964e747c5d5f4c352
+---
+ .../navigationbar/NavigationBarInflaterView.java  | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java
+index 51feed875337..5f0f9a220c31 100644
+--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java
+@@ -118,6 +118,7 @@ public class NavigationBarInflaterView extends FrameLayout
+ 
+     private boolean mInverseLayout;
+     private boolean mIsHintEnabled;
+    private boolean mUsingCustomLayout;
+ 
+     public NavigationBarInflaterView(Context context, AttributeSet attrs) {
+         super(context, attrs);
+@@ -177,6 +178,7 @@ public class NavigationBarInflaterView extends FrameLayout
+         super.onAttachedToWindow();
+         Dependency.get(TunerService.class).addTunable(this, NAV_BAR_INVERSE);
+         Dependency.get(TunerService.class).addTunable(this, KEY_NAVIGATION_HINT);
+        Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS);
+     }
+ 
+     @Override
+@@ -195,6 +197,8 @@ public class NavigationBarInflaterView extends FrameLayout
+             mIsHintEnabled = TunerService.parseIntegerSwitch(newValue, true);
+             updateHint();
+             onLikelyDefaultLayoutChange();
+        } else if (NAV_BAR_VIEWS.equals(key)) {
+            setNavigationBarLayout(newValue);
+         }
+     }
+ 
+@@ -204,7 +208,18 @@ public class NavigationBarInflaterView extends FrameLayout
+         updateLayoutInversion();
+     }
+ 
+    public void setNavigationBarLayout(String layoutValue) {
+        if (!Objects.equals(mCurrentLayout, layoutValue)) {
+            mUsingCustomLayout = layoutValue != null;
+            clearViews();
+            inflateLayout(layoutValue);
+        }
+    }
+
+     public void onLikelyDefaultLayoutChange() {
+        // Don't override custom layouts
+        if (mUsingCustomLayout) return;
+
+         // Reevaluate new layout
+         final String newValue = getDefaultLayout();
+         if (!Objects.equals(mCurrentLayout, newValue)) {
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
+++ b/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
@ -0,0 +1,95 @@
+From 1556f8d5c97d6fdec1099d6c587a2cac128d4f97 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/12] UI: Use SNAP_FIXED_RATIO for multi-window globally
+
+Enables multiple snap targets under landscape for phone UI
+
+Change-Id: I36e08f1e277dca0b0f9f99418671026e61b01496
+---
+ core/res/res/values-land/config.xml    | 19 -------------------
+ core/res/res/values-sw600dp/config.xml | 18 ++++++++----------
+ core/res/res/values/config.xml         |  2 +-
+ 3 files changed, 9 insertions(+), 30 deletions(-)
+ delete mode 100644 core/res/res/values-land/config.xml
+
+diff --git a/core/res/res/values-land/config.xml b/core/res/res/values-land/config.xml
+deleted file mode 100644
+index 7308dc5882c1..000000000000
+--- a/core/res/res/values-land/config.xml
+++ /dev/null
+@@ -1,19 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!--
+-  ~ Copyright (C) 2015 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
+-  -->
+-<resources>
+-    <integer name="config_dockedStackDividerSnapMode">2</integer>
+-</resources>
+\ No newline at end of file
+diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml
+index d686dd2ea690..03dcf51846dd 100644
+--- a/core/res/res/values-sw600dp/config.xml
+++ b/core/res/res/values-sw600dp/config.xml
+@@ -3,16 +3,16 @@
+ /*
+ ** Copyright 2009, 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 
+** 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 
+**     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 
+** 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.
+ */
+ -->
+@@ -40,8 +40,6 @@
+     <!-- Use a larger scaling span for larger screen devices. -->
+     <dimen name="config_minScalingSpan">32mm</dimen>
+ 
+-    <integer name="config_dockedStackDividerSnapMode">1</integer>
+-
+     <!-- Controls whether the nav bar can move from the bottom to the side in landscape.
+          Only applies if the device display is not square. -->
+     <bool name="config_navBarCanMove">false</bool>
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index be2dbc3cd5dc..c62cce393ff0 100644
+--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
+@@ -3726,7 +3726,7 @@
+              1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
+              2 - 1 snap target: 1:1
+     -->
+-    <integer name="config_dockedStackDividerSnapMode">0</integer>
+    <integer name="config_dockedStackDividerSnapMode">1</integer>
+ 
+     <!-- The maximum aspect ratio (longerSide/shorterSide) that is treated as close-to-square. The
+          orientation requests from apps would be ignored if the display is close-to-square. -->
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch
+++ b/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch
@ -0,0 +1,31 @@
+From f7e374407e133b9c53ecfbc9a5dc99a1460b6eb0 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/12] 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
+newer version if one existed. Sometimes, using an old app is necessary
+for one reason or another, so remove this annoyance and let the user use
+their old app in peace.
+
+Change-Id: I1a3021f0f9bec1ab6ff7641776391e1bd4c3cc49
+---
+ services/core/java/com/android/server/wm/AppWarnings.java | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/services/core/java/com/android/server/wm/AppWarnings.java b/services/core/java/com/android/server/wm/AppWarnings.java
+index 994f07959f3b..6749ae78c09c 100644
+--- a/services/core/java/com/android/server/wm/AppWarnings.java
+++ b/services/core/java/com/android/server/wm/AppWarnings.java
+@@ -168,7 +168,6 @@ class AppWarnings {
+     public void onStartActivity(ActivityRecord r) {
+         showUnsupportedCompileSdkDialogIfNeeded(r);
+         showUnsupportedDisplaySizeDialogIfNeeded(r);
+-        showDeprecatedTargetDialogIfNeeded(r);
+     }
+ 
+     /**
+-- 
+2.25.1
+
--- a/patches_platform/frameworks_base/0012-Paint-Enable-subpixel-text-positioning-by-default.patch
+++ b/patches_platform/frameworks_base/0012-Paint-Enable-subpixel-text-positioning-by-default.patch
@ -0,0 +1,41 @@
+From 1e6d2e5f957d1a0f497248d1673d9ecaa1a676a3 Mon Sep 17 00:00:00 2001
+From: Danny Lin <danny@kdrag0n.dev>
+Date: Tue, 5 Oct 2021 21:01:50 -0700
+Subject: [PATCH 12/12] 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
+displays have relatively high DPIs, the lack of subpixel text
+positioning is only unnoticeable on high-end devices such as the Pixel 4
+XL (1440x3040 @ 6.3 in => 537 dpi).
+
+For example, on the Pixel 5 (1080 x 2340 @ 6.0 in => 432 dpi),
+horizontally-scrolling labels in QS tiles can be seen "jittering"
+slightly upon close observation. This was tested with the Google Sans
+font on Google's stock OS. At this lower DPI, there is still a need for
+subpixel text positioning (at least in some cases).
+
+Enable subpixel text positioning by default to fix occasional kerning
+issues and jittering when text is in motion.
+
+Change-Id: I8d71e5848a745c5a2d457a28c68458920928ee09
+---
+ graphics/java/android/graphics/Paint.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
+index 451b99ea7550..e60d506a171b 100644
+--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
+@@ -253,7 +253,7 @@ public class Paint {
+ 
+     // These flags are always set on a new/reset paint, even if flags 0 is passed.
+     static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG
+-            | FILTER_BITMAP_FLAG;
+            | FILTER_BITMAP_FLAG | SUBPIXEL_TEXT_FLAG;
+ 
+     /**
+      * Font hinter option that disables font hinting.
+-- 
+2.25.1
+
--- a/patches_platform/lineage-sdk/0001-sdk-Invert-per-app-stretch-to-fullscreen.patch
+++ b/patches_platform/lineage-sdk/0001-sdk-Invert-per-app-stretch-to-fullscreen.patch
@ -0,0 +1,26 @@
+From 95ef97f5aa82c15e47f9313eca4899d89dba5dd0 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 4 Jul 2018 17:59:14 +0800
+Subject: [PATCH] sdk: Invert per-app stretch-to-fullscreen implementation
+
+Change-Id: Idf7dab4e1e0c79953fa672f33ec65fecffb37c83
+---
+ sdk/src/java/org/lineageos/internal/applications/LongScreen.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sdk/src/java/org/lineageos/internal/applications/LongScreen.java b/sdk/src/java/org/lineageos/internal/applications/LongScreen.java
+index 7fe0d68..26ea349 100644
+--- a/sdk/src/java/org/lineageos/internal/applications/LongScreen.java
+++ b/sdk/src/java/org/lineageos/internal/applications/LongScreen.java
+@@ -57,7 +57,7 @@ public class LongScreen {
+     }
+ 
+     public boolean shouldForceLongScreen(String packageName) {
+-        return isSupported() && mApps.contains(packageName);
+        return isSupported() && !(mApps.contains(packageName));
+     }
+ 
+     public Set<String> getApps() {
+-- 
+2.7.4
+
--- a/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch
+++ b/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch
@ -0,0 +1,34 @@
+From b63b5c1fb46eaf032270bbb65b9a61fe487c5e46 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 26 Jun 2021 14:23:09 +0000
+Subject: [PATCH] Jelly: MainActivity: Restore applyThemeColor
+
+Fixes black statusbar on start
+
+Change-Id: I6816f5b1dcb3c7bcaee2736a9e2a3ecd63217bc6
+---
+ app/src/main/java/org/lineageos/jelly/MainActivity.kt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/app/src/main/java/org/lineageos/jelly/MainActivity.kt b/app/src/main/java/org/lineageos/jelly/MainActivity.kt
+index 0143957..af7191c 100644
+--- a/app/src/main/java/org/lineageos/jelly/MainActivity.kt
+++ b/app/src/main/java/org/lineageos/jelly/MainActivity.kt
+@@ -192,6 +192,7 @@ class MainActivity : WebViewExtActivity(), SearchBarController.OnCancelListener,
+                 findViewById(R.id.search_menu_cancel),
+                 this)
+         setUiMode()
+        applyThemeColor(mThemeColor)
+         try {
+             val httpCacheDir = File(cacheDir, "suggestion_responses")
+             val httpCacheSize = 1024 * 1024.toLong() // 1 MiB
+@@ -726,4 +727,4 @@ class MainActivity : WebViewExtActivity(), SearchBarController.OnCancelListener,
+         private const val STATE_KEY_THEME_COLOR = "theme_color"
+         private const val LOCATION_PERM_REQ = 424
+     }
+-}
+\ No newline at end of file
+}
+-- 
+2.25.1
+
--- a/patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
+++ b/patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
@ -0,0 +1,105 @@
+From 9ee8209308b775f6cd4a104fe1cd89c9645e4742 Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Sun, 13 Jan 2019 21:44:48 +0800
+Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen
+
+Change-Id: Icb02c8dfd84882f736e37d6cd92c35e5eb288faa
+---
+ res/layout/long_screen_layout.xml                           | 2 +-
+ res/values-zh-rCN/strings.xml                               | 6 +++---
+ res/values/strings.xml                                      | 6 +++---
+ res/xml/long_screen_prefs.xml                               | 2 +-
+ res/xml/parts_catalog.xml                                   | 4 ++--
+ .../lineageparts/applications/LongScreenSettings.java       | 2 +-
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/res/layout/long_screen_layout.xml b/res/layout/long_screen_layout.xml
+index 40d0938..1119cef 100644
+--- a/res/layout/long_screen_layout.xml
+++ b/res/layout/long_screen_layout.xml
+@@ -36,7 +36,7 @@
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_centerInParent="true"
+-        android:text="@string/long_screen_settings_no_apps"
+        android:text="@string/inverse_long_screen_settings_no_apps"
+         android:textSize="18dp"
+         android:visibility="gone" />
+ 
+diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
+index 9340e57..63a4b71 100644
+--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
+@@ -434,9 +434,9 @@
+     <string name="display_rotation_90_title">90 度</string>
+     <string name="display_rotation_180_title">180 度</string>
+     <string name="display_rotation_270_title">270 度</string>
+-    <string name="long_screen_settings_title">全屏应用</string>
+-    <string name="long_screen_settings_summary">强制旧式应用程序使用全屏长宽比</string>
+-    <string name="long_screen_settings_no_apps">无应用</string>
+    <string name="inverse_long_screen_settings_title">禁用拉伸全屏</string>
+    <string name="inverse_long_screen_settings_summary">对选定的应用禁用拉伸全屏</string>
+    <string name="inverse_long_screen_settings_no_apps">无应用</string>
+     <string name="charging_sounds_settings_title">充电提示音</string>
+     <string name="charging_sounds_enable_title">启用充电提示音</string>
+     <string name="charging_sounds_summary">连接或断开电源时发出声音</string>
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 9fe4181..998a5f6 100644
+--- a/res/values/strings.xml
+++ b/res/values/strings.xml
+@@ -567,9 +567,9 @@
+     <string name="display_rotation_270_title">270 degrees</string>
+ 
+     <!-- Applications: Long screen -->
+-    <string name="long_screen_settings_title">Full screen apps</string>
+-    <string name="long_screen_settings_summary">Force legacy apps to use full screen aspect ratio</string>
+-    <string name="long_screen_settings_no_apps">No apps</string>
+    <string name="inverse_long_screen_settings_title">Disable stretch-to-fullscreen</string>
+    <string name="inverse_long_screen_settings_summary">Prevent selected apps from utilizing stretch-to-fullscreen</string>
+    <string name="inverse_long_screen_settings_no_apps">No apps</string>
+ 
+     <!-- Sounds: Charging sounds -->
+     <string name="charging_sounds_settings_title">Charging sounds</string>
+diff --git a/res/xml/long_screen_prefs.xml b/res/xml/long_screen_prefs.xml
+index ec947fa..20da90a 100644
+--- a/res/xml/long_screen_prefs.xml
+++ b/res/xml/long_screen_prefs.xml
+@@ -18,6 +18,6 @@
+     xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:lineage="http://schemas.android.com/apk/res/org.lineageos.lineageparts"
+     android:key="long_screen_settings"
+-    android:title="@string/long_screen_settings_title">
+    android:title="@string/inverse_long_screen_settings_title">
+ 
+ </PreferenceScreen>
+diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
+index 803b214..6f61e9d 100644
+--- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml
+@@ -81,8 +81,8 @@
+           lineage:xmlRes="@xml/power_menu_settings" />
+ 
+     <part android:key="long_screen_settings"
+-          android:title="@string/long_screen_settings_title"
+-          android:summary="@string/long_screen_settings_summary"
+          android:title="@string/inverse_long_screen_settings_title"
+          android:summary="@string/inverse_long_screen_settings_summary"
+           android:fragment="org.lineageos.lineageparts.applications.LongScreenSettings"
+           lineage:xmlRes="@xml/long_screen_prefs" />
+ 
+diff --git a/src/org/lineageos/lineageparts/applications/LongScreenSettings.java b/src/org/lineageos/lineageparts/applications/LongScreenSettings.java
+index ac04058..50ff8f6 100644
+--- a/src/org/lineageos/lineageparts/applications/LongScreenSettings.java
+++ b/src/org/lineageos/lineageparts/applications/LongScreenSettings.java
+@@ -246,7 +246,7 @@ public class LongScreenSettings extends SettingsPreferenceFragment
+             mApplicationsState.ensureIcon(entry);
+             holder.icon.setImageDrawable(entry.icon);
+             holder.state.setTag(entry);
+-            holder.state.setChecked(mLongScreen.shouldForceLongScreen(entry.info.packageName));
+            holder.state.setChecked(!(mLongScreen.shouldForceLongScreen(entry.info.packageName)));
+             return holder.rootView;
+         }
+ 
+-- 
+2.25.1
+
--- a/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch
+++ b/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch
@ -0,0 +1,223 @@
+From 3f7f3f9546f9f23d66381f7dff887cd562285ce6 Mon Sep 17 00:00:00 2001
+From: Paul Keith <javelinanddart@gmail.com>
+Date: Tue, 30 Oct 2018 15:46:18 +0100
+Subject: [PATCH] Messaging: Add "Mark as read" quick action for message
+ notifications
+
+Change-Id: I7194dca022e5062926fa35709de282721ca64320
+---
+ res/drawable/ic_wear_read.xml                      |  9 +++++++++
+ res/values/cm_strings.xml                          |  3 +++
+ .../messaging/datamodel/BugleNotifications.java    | 14 ++++++++++++++
+ .../datamodel/MessageNotificationState.java        |  8 ++++++++
+ .../messaging/datamodel/NotificationState.java     | 12 +++++++++++-
+ .../messaging/receiver/NotificationReceiver.java   | 12 +++++++++++-
+ src/com/android/messaging/ui/UIIntents.java        | 11 +++++++++++
+ src/com/android/messaging/ui/UIIntentsImpl.java    | 14 ++++++++++++++
+ 8 files changed, 81 insertions(+), 2 deletions(-)
+ create mode 100644 res/drawable/ic_wear_read.xml
+
+diff --git a/res/drawable/ic_wear_read.xml b/res/drawable/ic_wear_read.xml
+new file mode 100644
+index 0000000..9d017e6
+--- /dev/null
+++ b/res/drawable/ic_wear_read.xml
+@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M0.41,13.41L6,19L7.41,17.58L1.83,12M22.24,5.58L11.66,16.17L7.5,12L6.07,13.41L11.66,19L23.66,7M18,7L16.59,5.58L10.24,11.93L11.66,13.34L18,7Z" />
+</vector>
+diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
+index f285555..858f093 100644
+--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
+@@ -23,6 +23,9 @@
+     <string name="show_emoticons_pref_title">Emoticons access</string>
+     <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
+ 
+    <!-- Mark message as read -->
+    <string name="notification_mark_as_read">Mark as read</string>
+
+     <!-- Notification channel -->
+     <string name="notification_channel_messages_title">Messages</string>
+ </resources>
+diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java
+index 6df9e88..dbe86ff 100644
+--- a/src/com/android/messaging/datamodel/BugleNotifications.java
+++ b/src/com/android/messaging/datamodel/BugleNotifications.java
+@@ -789,6 +789,7 @@ public class BugleNotifications {
+                     (MultiMessageNotificationState) notificationState);
+             addDownloadMmsAction(notifBuilder, wearableExtender, notificationState);
+             addWearableVoiceReplyAction(notifBuilder, wearableExtender, notificationState);
+            addReadAction(notifBuilder, wearableExtender, notificationState);
+         }
+ 
+         // Apply the wearable options and build & post the notification
+@@ -876,6 +877,19 @@ public class BugleNotifications {
+         wearableExtender.addAction(wearActionBuilder.build());
+     }
+ 
+    private static void addReadAction(final NotificationCompat.Builder notifBuilder,
+            final WearableExtender wearableExtender, final NotificationState notificationState) {
+        final Context context = Factory.get().getApplicationContext();
+        final PendingIntent readPendingIntent = notificationState.getReadIntent();
+        final NotificationCompat.Action.Builder readActionBuilder =
+                new NotificationCompat.Action.Builder(R.drawable.ic_wear_read,
+                        context.getString(R.string.notification_mark_as_read), readPendingIntent);
+        notifBuilder.addAction(readActionBuilder.build());
+
+        // Support the action on a wearable device as well
+        wearableExtender.addAction(readActionBuilder.build());
+    }
+
+     private static void addDownloadMmsAction(final NotificationCompat.Builder notifBuilder,
+             final WearableExtender wearableExtender, final NotificationState notificationState) {
+         if (!(notificationState instanceof MultiMessageNotificationState)) {
+diff --git a/src/com/android/messaging/datamodel/MessageNotificationState.java b/src/com/android/messaging/datamodel/MessageNotificationState.java
+index 4a4bfd5..7555d97 100644
+--- a/src/com/android/messaging/datamodel/MessageNotificationState.java
+++ b/src/com/android/messaging/datamodel/MessageNotificationState.java
+@@ -334,6 +334,14 @@ public abstract class MessageNotificationState extends NotificationState {
+                     getClearIntentRequestCode());
+     }
+ 
+    @Override
+    public PendingIntent getReadIntent() {
+        return UIIntents.get().getPendingIntentForMarkingAsRead(
+                    Factory.get().getApplicationContext(),
+                    mConversationIds,
+                    getReadIntentRequestCode());
+    }
+
+     /**
+      * Notification for multiple messages in at least 2 different conversations.
+      */
+diff --git a/src/com/android/messaging/datamodel/NotificationState.java b/src/com/android/messaging/datamodel/NotificationState.java
+index 144f0fe..4c11537 100644
+--- a/src/com/android/messaging/datamodel/NotificationState.java
+++ b/src/com/android/messaging/datamodel/NotificationState.java
+@@ -43,7 +43,8 @@ import java.util.HashSet;
+ public abstract class NotificationState {
+     private static final int CONTENT_INTENT_REQUEST_CODE_OFFSET = 0;
+     private static final int CLEAR_INTENT_REQUEST_CODE_OFFSET = 1;
+-    private static final int NUM_REQUEST_CODES_NEEDED = 2;
+    private static final int READ_INTENT_REQUEST_CODE_OFFSET = 2;
+    private static final int NUM_REQUEST_CODES_NEEDED = 3;
+ 
+     public interface FailedMessageQuery {
+         static final String FAILED_MESSAGES_WHERE_CLAUSE =
+@@ -78,6 +79,11 @@ public abstract class NotificationState {
+      */
+     public abstract PendingIntent getClearIntent();
+ 
+    /**
+     * The intent to be triggered when mark as read is pressed.
+     */
+    public abstract PendingIntent getReadIntent();
+
+     protected Uri getAttachmentUri() {
+         return null;
+     }
+@@ -116,6 +122,10 @@ public abstract class NotificationState {
+         return mBaseRequestCode + CLEAR_INTENT_REQUEST_CODE_OFFSET;
+     }
+ 
+    public int getReadIntentRequestCode() {
+        return mBaseRequestCode + READ_INTENT_REQUEST_CODE_OFFSET;
+    }
+
+     /**
+      * Gets the appropriate icon needed for notifications.
+      */
+diff --git a/src/com/android/messaging/receiver/NotificationReceiver.java b/src/com/android/messaging/receiver/NotificationReceiver.java
+index bbb847d..f87779c 100644
+--- a/src/com/android/messaging/receiver/NotificationReceiver.java
+++ b/src/com/android/messaging/receiver/NotificationReceiver.java
+@@ -20,6 +20,7 @@ import android.content.Context;
+ import android.content.Intent;
+ 
+ import com.android.messaging.datamodel.BugleNotifications;
+import com.android.messaging.datamodel.action.MarkAsReadAction;
+ import com.android.messaging.datamodel.action.MarkAsSeenAction;
+ import com.android.messaging.ui.UIIntents;
+ import com.android.messaging.util.ConversationIdSet;
+@@ -52,6 +53,15 @@ public class NotificationReceiver extends BroadcastReceiver {
+                     BugleNotifications.resetLastMessageDing(conversationId);
+                 }
+             }
+        } else if (intent.getAction().equals(UIIntents.ACTION_MARK_AS_READ)) {
+            final String conversationIdSetString =
+                    intent.getStringExtra(UIIntents.UI_INTENT_EXTRA_CONVERSATION_ID_SET);
+            if (conversationIdSetString != null) {
+                for (final String conversationId :
+                        ConversationIdSet.createSet(conversationIdSetString)) {
+                        MarkAsReadAction.markAsRead(conversationId);
+                }
+            }
+         }
+     }
+-}
+\ No newline at end of file
+}
+diff --git a/src/com/android/messaging/ui/UIIntents.java b/src/com/android/messaging/ui/UIIntents.java
+index 2d10527..144e831 100644
+--- a/src/com/android/messaging/ui/UIIntents.java
+++ b/src/com/android/messaging/ui/UIIntents.java
+@@ -69,6 +69,9 @@ public abstract class UIIntents {
+     public static final String ACTION_RESET_NOTIFICATIONS =
+             "com.android.messaging.reset_notifications";
+ 
+    public static final String ACTION_MARK_AS_READ =
+            "com.android.messaging.mark_as_read";
+
+     // Sending VCard uri to VCard detail activity
+     public static final String UI_INTENT_EXTRA_VCARD_URI = "vcard_uri";
+ 
+@@ -323,6 +326,14 @@ public abstract class UIIntents {
+             final int updateTargets, final ConversationIdSet conversationIdSet,
+             final int requestCode);
+ 
+    /**
+     * Get a PendingIntent for marking a conversation as read.
+     *
+     * <p>This is intended to be used by notifications.
+     */
+    public abstract PendingIntent getPendingIntentForMarkingAsRead(final Context context,
+            final ConversationIdSet conversationIdSet, final int requestCode);
+
+     /**
+      * Get a PendingIntent for showing low storage notifications.
+      */
+diff --git a/src/com/android/messaging/ui/UIIntentsImpl.java b/src/com/android/messaging/ui/UIIntentsImpl.java
+index d64082d..9281899 100644
+--- a/src/com/android/messaging/ui/UIIntentsImpl.java
+++ b/src/com/android/messaging/ui/UIIntentsImpl.java
+@@ -430,6 +430,20 @@ public class UIIntentsImpl extends UIIntents {
+                 PendingIntent.FLAG_UPDATE_CURRENT);
+     }
+ 
+    @Override
+    public PendingIntent getPendingIntentForMarkingAsRead(final Context context,
+            final ConversationIdSet conversationIdSet, final int requestCode) {
+        final Intent intent = new Intent(context, NotificationReceiver.class);
+        intent.setAction(ACTION_MARK_AS_READ);
+        if (conversationIdSet != null) {
+            intent.putExtra(UI_INTENT_EXTRA_CONVERSATION_ID_SET,
+                    conversationIdSet.getDelimitedString());
+        }
+        return PendingIntent.getBroadcast(context,
+                requestCode, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+     /**
+      * Gets a PendingIntent associated with an Intent to start an Activity. All notifications
+      * that starts an Activity must use this method to get a PendingIntent, which achieves two
+-- 
+2.25.1
+
--- a/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch
+++ b/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch
@ -0,0 +1,142 @@
+From ff8f6e85177a0bab9c27785c3c0d9a59c4952e49 Mon Sep 17 00:00:00 2001
+From: Vachounet <vachounet@live.fr>
+Date: Mon, 26 Oct 2020 17:05:18 +0100
+Subject: [PATCH] Trebuchet: Move clear all button to actions view
+
+@AndyCGYan: Instead of removing the original, hide it in a simple way
+
+Change-Id: I7a0b2729c163169f7606ad4644870d07d5165e8e
+---
+ .../res/drawable/ic_recents_clear_all.xml      | 18 ++++++++++++++++++
+ .../res/layout/overview_actions_container.xml  | 17 ++++++++++++++++-
+ .../quickstep/fallback/RecentsState.java       |  2 +-
+ .../quickstep/views/LauncherRecentsView.java   |  3 +--
+ .../android/quickstep/views/RecentsView.java   |  6 +++++-
+ 5 files changed, 41 insertions(+), 5 deletions(-)
+ create mode 100644 quickstep/res/drawable/ic_recents_clear_all.xml
+
+diff --git a/quickstep/res/drawable/ic_recents_clear_all.xml b/quickstep/res/drawable/ic_recents_clear_all.xml
+new file mode 100644
+index 0000000000..2ad0bb824d
+--- /dev/null
+++ b/quickstep/res/drawable/ic_recents_clear_all.xml
+@@ -0,0 +1,18 @@
+<!-- Copyright (C) 2020 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FF000000" android:pathData="M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7" />
+</vector>
+diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml
+index 0fda0bf8d4..9a6f5ae062 100644
+--- a/quickstep/res/layout/overview_actions_container.xml
+++ b/quickstep/res/layout/overview_actions_container.xml
+@@ -40,6 +40,21 @@
+             android:text="@string/action_screenshot"
+             android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+ 
+        <Space
+            android:id="@+id/action_clear_all_space"
+            android:layout_width="@dimen/overview_actions_button_spacing"
+            android:layout_height="1dp" />
+
+        <Button
+            android:id="@+id/action_clear_all"
+            style="@style/OverviewActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_recents_clear_all"
+            android:text="@string/recents_clear_all"
+            android:theme="@style/ThemeControlHighlightWorkspaceColor"
+            />
+
+         <Space
+             android:id="@+id/action_split_space"
+             android:layout_width="@dimen/overview_actions_button_spacing"
+@@ -68,4 +83,4 @@
+             android:visibility="gone" />
+     </LinearLayout>
+ 
+-</com.android.quickstep.views.OverviewActionsView>
+\ No newline at end of file
+</com.android.quickstep.views.OverviewActionsView>
+diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+index 77db6b79f4..c0b6771e6a 100644
+--- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java
+@@ -102,7 +102,7 @@ public class RecentsState implements BaseState<RecentsState> {
+      * For this state, whether clear all button should be shown.
+      */
+     public boolean hasClearAllButton() {
+-        return hasFlag(FLAG_CLEAR_ALL_BUTTON);
+        return false;
+     }
+ 
+     /**
+diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+index 306ebd73c8..5b2f544c02 100644
+--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+@@ -133,8 +133,7 @@ public class LauncherRecentsView extends RecentsView<BaseQuickstepLauncher, Laun
+         super.setOverviewStateEnabled(enabled);
+         if (enabled) {
+             LauncherState state = mActivity.getStateManager().getState();
+-            boolean hasClearAllButton = (state.getVisibleElements(mActivity)
+-                    & CLEAR_ALL_BUTTON) != 0;
+            boolean hasClearAllButton = false;
+             setDisallowScrollToClearAll(!hasClearAllButton);
+         }
+     }
+diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
+index 2360396cf7..4a4202ecc6 100644
+--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
+@@ -103,6 +103,7 @@ import android.view.ViewTreeObserver.OnScrollChangedListener;
+ import android.view.accessibility.AccessibilityEvent;
+ import android.view.accessibility.AccessibilityNodeInfo;
+ import android.view.animation.Interpolator;
+import android.widget.Button;
+ import android.widget.ListView;
+ import android.widget.OverScroller;
+ import android.widget.Toast;
+@@ -431,6 +432,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+     private final RecentsModel mModel;
+     private final int mSplitPlaceholderSize;
+     private final int mSplitPlaceholderInset;
+    private Button mActionClearAllButton;
+     private final ClearAllButton mClearAllButton;
+     private final Rect mClearAllButtonDeadZoneRect = new Rect();
+     private final Rect mTaskViewDeadZoneRect = new Rect();
+@@ -875,6 +877,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+         mActionsView = actionsView;
+         mActionsView.updateHiddenFlags(HIDDEN_NO_TASKS, getTaskViewCount() == 0);
+         mSplitSelectStateController = splitController;
+        mActionClearAllButton = (Button) mActionsView.findViewById(R.id.action_clear_all);
+        mActionClearAllButton.setOnClickListener(this::dismissAllTasks);
+     }
+ 
+     public SplitSelectStateController getSplitPlaceholder() {
+@@ -1194,7 +1198,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+      * button fully visible, center page is Clear All button.
+      */
+     public boolean isClearAllHidden() {
+-        return mClearAllButton.getAlpha() != 1f;
+        return true;
+     }
+ 
+     @Override
+-- 
+2.25.1
+
--- 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
@ -0,0 +1,30 @@
+From e330d170e8e64c5c7849d0a0c288fb167ee828a8 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
+ violations instead
+
+Change-Id: I49dba61f332253e291a65e79ca70d9a07d45bb07
+---
+ config/common.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/common.mk b/config/common.mk
+index 43c36252..52a4bfd4 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
+ 
+-# Enforce privapp-permissions whitelist
+# Log privapp-permissions whitelist violations
+ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+-    ro.control_privapp_permissions=enforce
+    ro.control_privapp_permissions=log
+ 
+ # Include AOSP audio files
+ include vendor/lineage/config/aosp_audio.mk
+-- 
+2.25.1
+
--- 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
@ -0,0 +1,34 @@
+From 77bae190086a8c75bd80800487955bb7577cd374 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"
+
+This reverts commit 4d4e39a845d54e37b20728f1448ae6e3fde4b97d.
+
+Change-Id: I036bdd576e536392cf41e3c536d5ca2eb04e5a0f
+---
+ .../common/frameworks/base/core/res/res/values/config.xml | 8 --------
+ 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 3b6eedce..fccecf90 100644
+--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
+@@ -146,14 +146,6 @@
+     <!-- Whether this device is supporting the camera toggle -->
+     <bool name="config_supportsCamToggle">true</bool>
+ 
+-    <!-- Control the default night mode to use when there is no other mode override set.
+-         One of the following values (see UiModeManager.java):
+-             0 - MODE_NIGHT_AUTO
+-             1 - MODE_NIGHT_NO
+-             2 - MODE_NIGHT_YES
+-    -->
+-    <integer name="config_defaultNightMode">2</integer>
+-
+     <!-- Boolean indicating whether the HWC setColorTransform function can be performed efficiently
+          in hardware. -->
+     <bool name="config_setColorTransformAccelerated">true</bool>
+-- 
+2.25.1
+
--- a/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch
+++ b/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch
@ -0,0 +1,46 @@
+From 45ce666776f48f82151a4fc3c8a3219f3e4c210f Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 20 Jun 2021 09:08:43 +0000
+Subject: [PATCH 1/2] build: Integrate prop modifications (1/2)
+
+Change-Id: I24f54937e3e542b7c29ea86d24e3f523583a0c61
+---
+ tools/buildinfo.sh | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
+index c00e1e98b..490d15215 100755
+--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
+@@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then
+ else
+   echo "ro.build.id=$BUILD_ID"
+ fi
+-echo "ro.build.display.id=$BUILD_DISPLAY_ID"
+echo "ro.build.display.id=$BUILD_ID"
+ echo "ro.build.version.incremental=$BUILD_NUMBER"
+ echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
+ echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
+@@ -23,7 +23,7 @@ echo "ro.build.version.release_or_preview_display=$PLATFORM_DISPLAY_VERSION"
+ echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"
+ echo "ro.build.version.base_os=$PLATFORM_BASE_OS"
+ echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"
+-echo "ro.build.date=`$DATE`"
+echo "ro.build.date=`$DATE +\"%B %-d, %Y\"`"
+ echo "ro.build.date.utc=`$DATE +%s`"
+ echo "ro.build.type=$TARGET_BUILD_TYPE"
+ echo "ro.build.user=$BUILD_USERNAME"
+@@ -58,5 +58,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then
+ fi
+ 
+ echo "ro.lineage.device=$LINEAGE_DEVICE"
+echo "ro.lineage.version=LineageOS 20 Self-built CGMod"
+echo "ro.lineage.display.version=LineageOS 20 Self-built CGMod"
+echo "ro.modversion=LineageOS 20 Self-built CGMod"
+
+echo "lockscreen.rot_override=true"
+ 
+ echo "# end build properties"
+-- 
+2.25.1
+
--- a/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch
+++ b/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch
@ -0,0 +1,25 @@
+From 1c0c37fd29fb20537eca319cd5c3874127414d8a Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 16 Oct 2021 00:39:15 +0000
+Subject: [PATCH 2/2] build: Remove Stk (1/2)
+
+Change-Id: I24ef17c74c3137a11b463cde96c74d0edc853edd
+---
+ target/product/generic_system.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
+index 1a639ef71..49a080076 100644
+--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
+@@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \
+ PRODUCT_PACKAGES += \
+     LiveWallpapersPicker \
+     PartnerBookmarksProvider \
+-    Stk \
+     Tag \
+ 
+ # OTA support
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
+++ b/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch
@ -0,0 +1,389 @@
+From 813967892cb708d48b42552941743487d820d52d 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/21] Add MiuiNavbarOverlay
+
+Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
+---
+ packages/overlays/Android.mk                  |   1 +
+ .../overlays/MiuiNavbarOverlay/Android.bp     |  28 ++++++++++++++++++
+ .../MiuiNavbarOverlay/AndroidManifest.xml     |  22 ++++++++++++++
+ .../res/drawable-440dpi-v4/ic_sysbar_back.png | Bin 0 -> 2756 bytes
+ .../ic_sysbar_back_darkmode.png               | Bin 0 -> 2547 bytes
+ .../drawable-440dpi-v4/ic_sysbar_docked.png   | Bin 0 -> 3642 bytes
+ .../ic_sysbar_docked_darkmode.png             | Bin 0 -> 2810 bytes
+ .../res/drawable-440dpi-v4/ic_sysbar_home.png | Bin 0 -> 1362 bytes
+ .../ic_sysbar_home_darkmode.png               | Bin 0 -> 980 bytes
+ .../drawable-440dpi-v4/ic_sysbar_recent.png   | Bin 0 -> 278 bytes
+ .../ic_sysbar_recent_darkmode.png             | Bin 0 -> 205 bytes
+ 11 files changed, 51 insertions(+)
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/Android.bp
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png
+ create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png
+
+diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
+index 36ec11af3068..c5ee8556b75a 100644
+--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
+@@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \
+ 	DisplayCutoutEmulationTallOverlay \
+ 	DisplayCutoutEmulationWaterfallOverlay \
+ 	FontNotoSerifSourceOverlay \
+	MiuiNavbarOverlay \
+ 	NavigationBarMode3ButtonOverlay \
+ 	NavigationBarModeGesturalOverlay \
+ 	NavigationBarModeGesturalOverlayNarrowBack \
+diff --git a/packages/overlays/MiuiNavbarOverlay/Android.bp b/packages/overlays/MiuiNavbarOverlay/Android.bp
+new file mode 100644
+index 000000000000..fc724fb7a686
+--- /dev/null
+++ b/packages/overlays/MiuiNavbarOverlay/Android.bp
+@@ -0,0 +1,28 @@
+//
+//  Copyright 2021, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "frameworks_base_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["frameworks_base_license"],
+}
+
+runtime_resource_overlay {
+    name: "MiuiNavbarOverlay",
+    product_specific: true,
+}
+diff --git a/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml b/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
+new file mode 100644
+index 000000000000..3f10e2e03675
+--- /dev/null
+++ b/packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml
+@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.miui.systemui.navbar.overlay"
+        android:versionCode="1"
+        android:versionName="1.0">
+    <overlay android:targetPackage="com.android.systemui" android:priority="1337" android:isStatic="true"/>
+</manifest>
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..be2b145b4c698679bfdfdc3e5834ad12a56724c0
+GIT binary patch
+literal 2756
+zcmcgu3s4hx8V?1-3OZnL5L?tGprz_2n-D@036KXu)CfXOJj=t)?k3rRWWy$qfRADd
+zhu~RzrHmZ`k!wBAa-g0-rC<@UbSw%?@2-FjLbWI3sc4FiE8=+@UZak6oX*Yd%<lg8
+z|Nnj8_xql+C5ap3=6k*A#b7YztKyYO^xNUO0Ve${b@zQjzvi0be`{edy!~9a8{=SQ
+z0E02-I-%KO-J;$gK}jPA!ALF6u^Y`an!$*Swwn<&6Ssm|Tu+#!?7J;(Y>>dD?38dd
+ztTrof0}-E3;mP?MHE4b&D#qB+QDCH9LMt%hRs^&gvrHC=UCN%+E1}n}Z7v&}gjh4B
+zY?;d-xJ8`^Do6?k!#P3-<q7y;gqXt<!eYK)HOPl~5nMQe%L{{Go&*+3!o=Y8#ip%M
+zm`;+UTsv)x{*tl{R;yXU<=SjEjxCHsQhF{=EEaQNK9|pjXar=*Gg%QkWU>U$Xi(x7
+zlp@Slf;53Hjfj@au}axA(<v8>=2^8S%XFCNfN|}JnaktAE|(^O7&?nH=TKRb#xazO
+zXW>TNWVO&(-YnK^Ag!duK>mX2+2iL7(4keUXKlQci_ti1!eWihrQMhg$V<@{O`aL&
+zCgBz`heGk#T$*OE%Nw&qLE(s%q%<U%HIt~s8OoqS;Yy4M3{4?S7-_S-^Nb9xM69@!
+z&4>9g1PdUZSi=)Z;4q0mv<jvd@Dx-{VuUX5c_<&&z+wr^e-1~N42D>dS0gc0q9Z9I
+zLVHUX5k1Z|oAhjOHii-fnMG2xNt##Kv->KAB9S6>L>7HuNs5z$s#t}PCl(4JK8H6+
+zRIQe%OcpC*LUEN+%BCa3AqY&Oi@?J$Ow5Nc1V$i!xIhPKg(wU~XoZ+CLZFL41n7*s
+zl0<V{`Ja);Xn7tSCgcf3;dFTT0*D_WKq0M&r-igAj_`Ftfmj4%Gx7-(LH8e$^{e%`
+zy3$oRl6b;Gr!;T6Z<6us=~Wg1PS%P9L0vr{Wuva-<1~Y*ZQ>;ncs&oM<ZT9=R{DyH
+zn1WeIoz;d=xJ*w+>vf8b`%C;SNbalIzh3@c#{R`3{gu?GBa0dklOCsMDwpkYhU=O>
+zQ+eUOn6k;UXC~DQoF0F!<?P(0KV~O4ZlYCF^j!XUap^q<!=qTGlxgghcLpzI2I7Hd
+zop&1=Rb{C=O13WFv&cEW&Z{wW;e<Q&?MZ<+BoVl;U0-vbb#Cc)|K)p_8jp83c{$Qs
+zf#$i|iq9(c4X9IU6PsEtnf9^*eRi@sPh4r$f7vp`odAP8ZY+*k++U>^ZVLS7lRN7l
+zGj9J74={mtxg3rG{8<h+`H2sG=lME{3bz&bt`6~VFWeRs6aad7&uwP}ZTX)=m&8A2
+z<bEDn+B8vnHu!AKy$90a>eHA0^M}}$j0Nn&!DSa(^KN}#w`^tkw+ViJesRq{pPnhb
+zetNmiJ2qydzrX+F*1FBVSA4B?vU;l?=0D88{Gim=ZOI}|s)%}cdtiN9T3S#2#PE$v
+z718cb|70_~Q{Hs`<9eWKq`PVjExG8r^3<tQ%iQ<7J^n7e=TLQ9gAX_dsM2>==4BGZ
+zu@9BzC*uzicE4Tlr0%{ayKp?GGHU1ezBRVdAIpHh4&2tewg0R3&kcRSg@f;(a14JD
+z;%IJe?&)Lu%KdusfwggQ`!y@ee+~z}x_$Fz9tFJ-BydIo?Z=XjrXSa=w5UAB#>O(j
+z<zV58Lu-NG6&Ghf2f7AA97RP%U4w&z2~#JMC6U?J&UgKj%FCVaAir0*&`d!05%AN`
+z6Xp9r+EfCo{X*H>87s@zrIZ0)Md!+|UcGuW!Vv?gBUb@TCNq6?`MS0h3s!SDyZZY2
+z9$j3!0H`VP6!i`bJ>79kGrqiJxO3lIL!|$1--Gso`c%#%ge8lre(JpULr0I%U$#bW
+zIM%X1JMeD8uC~_J3ERS0V`Dqkbp*=xJPvp=Jv}o*4|M%4v)=2iT}OILNAQjj?j84j
+z8PGd?=6!k1y*oPIXJ?iMW%;}j^G$DW@2Z@u>WTcYfbY`x`!@Nw9Y!(i$HsL>eu|!V
+zYcRuC?!BRE^Qh>?M*&oGYR8%n<c8fu;-D00P960={75z_mFq8Ob;wx?VMSd_P%NO1
+zy7hNM^|g?aouxE-ASTDg>A84uN0N`?@~s8uMrC^ny2nO(+S2Marz|s+To)apFUHaY
+zZTxnryk82`26T3Ie(;;xe+-oc)TgyP+{BualgDfAM>p3#ImztsJp1Xt3)YWyuh?7A
+z?Q}YAnT?mLRr8XQlkd7$5y#_z?e55&j+zZCEEA)HE$`LEg!=D2Ky(yuOO7sB81xtI
+zX}j~9^U4=wM%vb`2P-Nocld}taaHOcjg{w%KR515?39hZm&k0m>4`VY^SF`@H7YJN
+h9r{0Z;ER1d?z2;NqUud$cCPC`Qx&^WSufw__%Gd*;i3Ql
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..4873f84ff7f4750fa3adc70428ffb123502c1051
+GIT binary patch
+literal 2547
+zcmb_eeQeZZ81J!-O&ofY7;XsC6~zzi_3L(9o89Ji-N!}lm~(+4Q|z_9t?aJ7wPkn1
+zfy<Q1N5sVaL5?ZINzkZ#i3x{-Y|2E!v6)~*5ZF)|2|5SPgf9`_?&AVxDjF|o`}Xbc
+z`8~hq<9%|gOFhMtCrz6KLC|DZ30nr9O~#cn5!}}#n6HD!9l?@?8U)=r#kfq+hSx0+
+zl=PESUZGdG=Q6w!uyTUp6|Lbw5TGF_Codf2_!?1%y<(LlJCMPT_am?*IFJRIZrmMo
+ziq%rdGF5zPnWvmzR>RW*l9vnTgc(2(5Ood?2mG?egdNB*F9X)bHip2%5WU8M<Qop*
+z3U?{&R8$epwAxXgu#s>UZ6)kDP1+uVNu0>S@GOj=P@G_JJ44a%=nnzjRKdrTu|=c4
+zz?%c9*7YERVWCjS8ltR<T7?lbO=CETkt7Nbs8%oQTo{$LSz`>WsPU>4)FnlR4MxtZ
+zEY%$dP&yJqAQ-2Wwb3+zgkfPWh!IxY2x%B7@Nrylsp=ngF7TM>7XzZKYXD2cvB7FZ
+zSF~#7FR0_6Z*c%p>vqR|jH@LOh`Z4A!a5MfXhOzCYvuJp5i1ilWvR-Gg>^vYEF+pA
+z<5WdXSJZMv@sAa%bWAerbQ*=ph96!a$$}En9=XXzWI0`QAS6!WC~iXux}3;naEh^I
+z&%wb0AA!0RLGsn#3MKJ!oMv#6!HHX-plbw9=l&5a@QhDU100B13UE~-7L=<HIG#zy
+zsrVHYI0ovdoA+H#XQ`_ABtQ6|l@%Aju0p4spzU^)v=YN|-EPJuYdR<MqKkDPAU{?~
+z5*Q!n&BA${LP-(NMrofd3-x+QaO3TnbS6)6w2d6IXBB>_(FJ4nf?>~lMcU3$XeKX^
+zC{5YCD2-?0C_&PkS0rsbne7|1pQlRT6mtIm%wwEQqkWhXNdtwgA3Z%!iM69EzXT6=
+z48!rpNpK*%(E_4?jBZQgW#G0V7@-YSi-7cR`eFp8DLy^KsbYQ=$ky$&9`;xIHLmU-
+z)ZbS9##28|tNuszqsir~Ik`#%!xck}crarOjg$uabJd2w-88bs;9w3K%lH5WFYysB
+z%79u01Ns?xr3r!(wz}B-^6={er+U|J(JTiqUYb=r=?+)j*+%v?w(NOt*UUFdHlyw5
+zewov1Kk?#Ly5gAsp5x!BkN<A+KDn+0K~`^eKX8v{`o-)h)=(Ad^0W*NeA2sp*Ojk4
+z$L0?1Ydf)g%fk2P&)M9vZ04p~Jkiv=$(u4EHNVT8XlYuLk%A}Q>oh-?@@O;MVJ=V2
+zZ_Ied(gZn6iT@dxz2}l?QDA3<|9p?wU)Pu3XY1=ft6n)i|8!<uZdzmP<ix$ElTc+s
+z&X<?kZ=C+g`9*BVf<$*jde7^gtX+3yP(4Y{CR>;EFHfs|=cwyc%>Gg==jDv1wXO9i
+za{teI*@9iE0OJeO(an)d#Rr^kc+Sgp8Md^_6WwXGFTCAS#LdqT`WJT8bcjb9py>9V
+z!taSzGdVQ34-eK;c_x;P{l0rsHv(uA!uLkoBW)9Ywl{VD0E8S(N1`7@?w$~u*1350
+zjDo_TCHiipEvYWOv#4eAn@Bi4`cdR=Q^?Y}b9Q=xZ{wuBiIv~RdI<KyqPF)w5A1x}
+z{Udhp>eZ`{bj;~k=UZ`q^g(3B_1$e%OM2J8Kz2R!scbL0fIMXBobD!GdTald#UE8(
+z%%i%@UpIy}ys9K^?2aAT$BVOPPc2}7OFfyg_uJTRQ}Qck2Hn=g##NVBpE*@Dm^n1i
+z(ein)p(WJ>BP)beXRiBBC*{bg2RHarptOq#pB+Ase57IO4mtHcH)B|BJag#6lT>d)
+z&e!MKYd16)pcy-+T#iQ8NA~PL>UxV>Ywqi@Y)j6S`k$w?tzd_2HABdEi<&LDf&OGl
+zTMQD)&(DC^16irql!1BVKzD548=h$^kFSKxX^W`?7wW0OL$Ts(m0$Hf=7d(Q+HUb)
+zZja176mx*WEKzSvUf!OU*cv&PpiG!*8*(2$`^!o+r{-7RHTJTToo?Eeu+BEr?K!7Y
+z*9^Z;G+Rzj%oUn%d}G_QeqvzVy#Kj5|3$lBneo8k53^T$kGYM%Wv)UGyRG24rau72
+C-gtlj
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..1c88fc5d571d0ec91b735082cb9c512603b9ceec
+GIT binary patch
+literal 3642
+zcmd5<c|4T)AAgXLtU?sZ>`;z1=4ec27}t!mFecWOW6V65n4>u|Nyt(m{I-K4RF+T?
+zD;v2IE9>Y`v5jG4)vknAtz6k>N?yCa-~O)sYv(o3Jm2U0eSbg4`}_WUW+sK=?xeCt
+zdkp{pDlX1sDs)ejUW%)s&s4c}i_lGp>+Ht|0A+RQB?IJ~+Xw*ix=b%$fv?*x0-eJ$
+zqcJ$4pqYrph0p+CWh3I!=#iiR77B(l*+lr{%_caE$sodg%-v9KToM?;bdKSHyJOtF
+z=rNIWJOgfH4YLvvAOkE=K!b@`QEWazM1;S$OMu4GX(Sx>9wLY&!tJCEVZLq@7>UCJ
+zVdiEy1RagVz;@ux&^QzxgEfU=Q0N^<)D9$iI|79!pm2okc-Zm_4te7-!U$Bd<FYU4
+zi3pDn2)G0!GCDfiEPA^chZl}S<MDVT3WLO85D)^vKfo5yL<lxt|Dy#m$fxs|Tmh5A
+zhDj~bLODVK5e`NAAq5t9#Vnh@OcO*HQbgk-(Pk)VO7DRT`U;LK<VC%A&Y&Z~D3ArR
+z1$+pLUcquBI06nog7a@ouPpz;0Yt5v+lr4rjfKTpalscj?1$1=Cge}ie6Iss5J?63
+z93hVmI_!tS)R$(%C6IU^O~B!KaX3*Q4~p_JWEhDgJs1m^kq?v2;6(F{f42uD(*z(9
+zjzM8i2ox59#(QBf1aor&8v7Z_f`CGOfVy!Q%&-Ih3f)dXLvP$4ppa@9Gy(0uf*Eu|
+z7>CEAK{+#7v~Uo~WrxFID@+ndoG1<tatuYc{rB@OBoc+k31db<3w)}RJ<P>{ghS(T
+zI0VKF{XSebH-ZbBFQBpMpbMD@hxjpLG8u$WIxRE|2Z9JRnt?{(vDi=qEewl6phC?-
+z9NIh-1%hE8_meqvp;QGQ_cQ*_{T@6fRE4ytzidZZn^O4@oSA&+U=J);&u(zv@+gW4
+zd#@M*jV`SOBAhOj0LXwZPc#2A10T#rM}Uyg|DcNxFg_<t5KZHOcHt0P|BLjHQ2a<~
+z*?vd``OjItU;AB&e}qGQLpoe(SkS{t%LCa^pW{Idtrjhl4*-g-E@V3|(Ycp-tO$+S
+z&FxK=+vlxrqVESZoEf;j@ym6`TKrmdN42#hk`pIQVr1+tAak^g?MGujO?qpO{vqvD
+zHRYZ@)@0Cf=sFkqkax9h%U4c?&Y?!xhLT5C<2_vy<2|I{u6V)m>NPj(CVp9L&g@tS
+z-yi+VrXX+DW}!c6PoMm!)CSdrdOgZ2*#!7H83!0(B)k6a@^F|sDOZw3F?#K~J^@wF
+z-woWEO3H4<*{t)OyK%TkFGEo$LH;~E3%OXB=D5_PrGm5vf)gHIkL-&ZkVqCw%gXXP
+z7(6GeHtRHqU;oL`lc^UCNEiOG3aBz|H*lc>&HK)!vc%hf8|9IHS>9K?O#F+e#yQ2a
+z4^hXj6f>93=I1vGhg(w)0$33hTO(s#{sJdZv<HSqMn(!od9?>8#BF|lezimlrb^HD
+z3UjP-P=WGBNkn#Za#B50JUjlTuM+oDU84mS`%rG5&mo`Z^EL1v>(UQ}D<4QtLMSUM
+z_gNAMahe04n`QTX{r&hib>+y&oSHo*ryuVuI^k)mseHnqR!2uiUR=WhC>jnfmwL-a
+zEG{rGXH&`W4w2Ph&aQ1@Z||4=jfdvr96V3lnkmT5y;*l~W+GVb&W;%3V@c~?xdaS>
+z5YsFSG@MEnhJ}SSj!#Yw$(>iR)wWf$)g63kwFU-<o3;dJrXEroHfI6>3JMA{J$LU8
+ztsUH8+KHK)o3maGdvtS4S$TVmo~;V`n535fe8(;2*Hce#>j2iaES=jlz%nZ<i>+W2
+z$>aT^1)PfMBVE70c0|#YkT>z#CrWG<STA}dn_w=I)cbqNT#Fg`Hhub5%Vx{{f{RKq
+z!QHULugb>U<3XYD&8^YSY%NNFQmn}(_q;iuO5fOLTGiFnvB$QRv>&mN0o*T8d|&za
+z2L#OM5@V`2bDjriTgShP^|0D9G^VAoCRw*$=F*YkP2_7h98Pm#gM+79_}%<PL;_;U
+zaYJOX?0F%VJCznf!{sh+87!fbdNtq!4F_k;Wc6bu5=nuFheyGSmoFC;Z9hxUs1It+
+zeZ4WUVfBWfiVLiekdT@2@$pFlbX;Tc87%Q=X=!PEp%OVFXJ1lLQBlPcu~;EdoZ2@0
+zbrf!1)vZ@kIk_d3nWIxzuBF>vDGcm0Iqljuv?I^`@(F|Ftu80pEbL7*(~8tn$d2BR
+zGBIbn44-m+RT`HHoif=1p>T1Hu2V_8BAiaAE4cOUi5^;igmz`Es_IP3&BBKbTguYw
+z^lTp){;*zlUBQ_%KLrN{E>673t|ahk2PF6J-<ONHSbHQ)gtb~yALLsLr=N8fL__Ru
+zRZGbr!z+o}>1<Dpt)IG3_jsN%0`64lo;ENZZ|biym25ao^UI=%YnbBwm3z#zT#Fv`
+zQcGWB3+^Jjy1HWd3vXXF$r-^=^ZiqA`lk%1_F5;dsz}ybzf-B=nSMy`gS*73eX^Y)
+zD7_1Z`_EC-$ZFz+B9D99qI=_VgC{#5_WQ)CcN?@!x1Q?g==g$2Bo-9+{@mkhT7%F`
+zW2KSd#(r5NRi;iG99)2)Onr;Ojl0|{O*;j;mm;8`a-P-EHhQeR?RzdacV7JT_R*!a
+zllLi(Un_b}I=Wt855qw!hh=w47UNYK{IAv3%}H8Y$u{-hcTsjfq&KLZA5))FRD}rC
+zK2rJ1T&J(juHHR*Iy#n$6$t7~ObIThsParcWO<}K@MgxUZ@f)5Aac9oE;FCZ9HB9G
+z7Ev1^Iu`7<w(m2UjSZTfQ9XM5DFahF_l4{Ii0ZAUT@RI%?RDCA62I;o9Y`1*9j%C-
+z7?|A&ykHmlFdE#h-~i{NpKN{t`ekie__n8~C(ay&x|gn%Vr&w$B`mJ@$5R>!j|T?_
+z_1rx?mTpN-0sN;e$<|mqYkP_6`PJ~GilBxV3!_^tEiHXOO<_$sZBuj2{LJK%@ms%d
+z*b;&~?DI)!3bY3<Jq(PVymE1I@t|X9s!GV>KrNr11#XI??cAxXzI#ypD=(8bhnuLT
+zngw}ye%R{4W{<0t<-tvj^))rW-a|SUQFrY+;K7BeC*QERb>!96Y_q^8%IHmA^iwAd
+zJ@(gJzb>4Y&nZS6PBEU8e>~Ejsg)@2l%b24tN7A)=Ozu{>LrhYclKGM&riC|#=c_}
+zwKW8cNt{dV=$>OQUd%%Z)9*i)TTsx1x3IXO)%<zAb9g+I{KooQaGSh_t4&SucOji+
+zPZS4zaV9zHZ4jyVxPDhp&%4IUmtRc(fa|P!ZRnA|u)DX~A+Rqyt!>!9cF$vBAkz87
+zkI$wLbXS=w0}Q{c0DpgK#z@leD-l#+TSF`RHNCyXCp#Dix1F3dP)mtYYFru~9u6j0
+zT4pAWD85lWjDfmy;fuM8^BE|&>9aR<ux)ojA>PN-MRrjP24m^F@4jQrjEbYXJ4Sgk
+z-?q2gkkq@)v7Lo7BJ_MoP%UrNY5v!j^C@LzHqHiWXCtt62;EQGZ$G_OX5?z6vBtQ$
+zv%@%J#J7f(4M1JEy~?zKTKZEBOQ)Dw{&U?s-`?tE1=TIF{PF(ErbLKVt)-Ep7>)Y3
+zmB;;;C`Ss;J@85~Rzb>^s&u0=Z1)0xudnCjUkeLb#35AXG~LEX`tQ!g!JS-gACmYR
+D=8d64
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_docked_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..fe51e11921ecb35c5535e7c446769af7f66be893
+GIT binary patch
+literal 2810
+zcmcIm3se(V8jh_}EK8-jfcRpFisopZKuAUc4GBuXuz*;Bl4?jMA>=V}5=f#b5>wH&
+zNOz?^0L5da^%X&CG(sC#P&iP~WhtQrr3fM-rHFt=DYz3}$L@Bwk8?Wb+_`t|{qFa_
+z|1$?7BQ`j{x#&#{2II^LWk;j4-aZ^1(Dz?ocNs&cxysNu6$az9z&>VSa`P8rFmskj
+zVq(>?+>M|BmJ|3wI1wUf<w_Kd!2|?pm3)B|QUi&QSfXHH2g=H^fJDf^Zt>%ixJnk3
+zBnjPtK$~_%#0Yjs1#}@cC=dwHf+&F;Qu6_=T&7TgS_XE47ev?gZ6X$!fT*PmEYmI!
+zh~-8CEEs_RKLQmmAp24Pe>#CoCDAFqYXJ(0>`x^56Ujb!5*Z{>K_5CW^<YtHh)@JZ
+zv)50_LcbW;B(+)z5{Vj(hM@5wz=)Vgrqk&}5`{>i;86r#rBkT+TD(HFe42p`sRW2b
+zsg}SBz|P1|gj3WEEUM|G33BBOtwJ^BCe&d>Eni6_6G(QGCV)c03{IJX$R>mf1w=>&
+z$svVWg<{DwSY;BdhE+-M|Dc{Z{)qt8wOsCujGxs-E}s#hQir6XW=uKcXVIz{of0BO
+zLn=505kMiSsG7^|)+j+10`b)_5(C4s=|DwJs|>JM_Q249)mtPAA*@m1UbzFY`D%!P
+zrI08jJjoYNrpHhypr0Q|_FY4wfh5u-lnV<bBHe#OeLyk=B>VgXie`<Fujc<ESSSER
+zFe2xpHcRAuF+@}<#8_a)lOPM0!3ZiC)z0VDeGZEiiNGR>3_VaqZwLlBAuKAHPNm{0
+z1oDKsTrS8_sMLIg0OGJ2SkylRi9`sBXk?nNfF{5T{i$TU(AO8j(?nD{o=Q)INCJ^R
+z**8%%eV+{rQtVkUeP8$+@BamnpjF71{caw6ZQ9cZ43((R!0M)|XA`u2Y9*5Z6Bz^Y
+z1@=l{U<LLRfP~noZOQNUz$C3E2|`K#PhL#IRIo^`;Uf@JjC$+Wq#hB~pJ*@JNmGdb
+zY30P(D<wV+NBf3-In%JvkC~PSDbPNLpbgCy>ah>)lLii(8Kcebzsuc!V$0GuI>awl
+zKKQ(mz4v(ayJf{4l_4t~-GU<TTtDl?GrKVT^|zvu@hjKN-ORof>8>}smVR9r8}m<W
+zh&#{G^<3);?tT+Dw<xTy#!Ty>z@Ih*BLgSu?>&<}_;O%Z&v;M!^X~kild63eWir`*
+zGgOwo$4p=0m@(U{bhg(=0Q)E~d%oe}e8W3>7oOfF)a7)z%WHFk)pLUZ=6(XxafM^!
+z%0C9IY)gHK87eL*K^nT^`^L1GfodMj!1yM6m)W$nbg^c*tL1TW(75}hj*rJjmfY$r
+zvTeq7XE*Iw{$tOoHLNcVEHlLSeQEOwyj+1Sws}~h!|369Wm9ZiT$Ge|b6~rc0~J(V
+zj;?$Dc3_oP>AoM<wJ+4W4~FMgI+^!eFyARCH@qC~YAe3xInY#^b&c=(EXi0uUMv0X
+z;D*60o#jA3g?+HtVzHbbD-rMgz&T*wg2J3FMWb0SGvoVarMYj-&9~_HN~O}GhEJ+f
+z7ZrxsK5B5O=qk+F&=Yqm2bs0?lF71k-qWU?O3#zW#m0V8U4K_&?cnCLof)R94ziRC
+z(-F}PAb=O9(?xv{hD)zJUVBc1KX0XE%{Me1?i!UEHH7n#<sl3TeWderGQMdwljcWn
+z&)nb^E0tbTz2FwL^4EK;4K&`x)jNDRuQ{H0Z)agnOHb4(Yw3Gs3!dM(KO8jpeZc$a
+zWzO42zgd-YvO;_<AjP4)Vra~Ey5aiXHLWpE>fi78tTx79DA|(dPy6s$XBVxwd&HAi
+zm?k&eR_3_PT4voHm+9SesKd$W{If4^wx3wryjn23Fz2w1bTU5pdO=r4bX|D(S<|1Z
+z)Xtks*6h}VT?sdt#&h3g@y1Gc+OO`n5jxAqY$aFc>o(^d3Ct{)8Y|#%-0h8h&VwF@
+z9(#9IJ2&~=$nr=mwt4fa-ncSYc~|=x^-0jS&!xwVl=jY6*PFc$a^hN)9z@B7qpJq<
+zqU(x28(E*UIrHHn@5P(m9TcP`|6^rArF%Fo-J5Ba4C@SgTdQ-*j>bIov~9z6-*+sy
+z=fY!Y?kr|0nQh0OxXbUSM@b)v4~M<HdYv;z(Q@Pnx*j!M-(NP!X}LsR@~@|>Hi{Q%
+zE_%fqMn*<>@j>I(+Fs9&zeU$I>%Kl~YR|~L!a39HaBQd5YK^!x8F%w-lb7~%&XZ=H
+z+e4|_s$}En<A&Wk=G0ta-akY|gU)+zndjDR#+oaapa%~}2zNN^=T@%st`UdfZsX5K
+z;<{ab<Ri&aN6nciy)qR^J7axe32}Y2(=D4DaiX-{w61nFQ_KIVYk||nl!UxvxgJ=@
+zPyXaq(EQZ>``&ENi>7hMdC%_F_+PY^hPRo)r3OWZW=K2MPrcDED2RL!Xt8vkJE)zX
+z-V~oT)Oux5R;-E33*V;tVNb)yb+5NR>W-2ZRjJp$7KAHI+dUEV4C~Ug_)(`b$H#2-
+z`bQ_KuDK1jhWpnoWa7F50`&#S+^1N^Ir+wKLF%`c_w_FNG}$;%Q}cLP|G-;sNxL%F
+zjkdIn7B)5DillcP<S(B8-D*l`w7N#LCG5&?4-_@xs>vH$T>QQN$hPt;8`hqev)+b-
+VfHkC3x%R(PPDlj%Qt&qYzX3LdVM71_
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..20f1d887aedebaadec7f31184bdfe3e662401522
+GIT binary patch
+literal 1362
+zcma)5dsvcZ6eq3COPOfdW%DV^ZrZSmmu5@DVMeK8>Y7WZW@(O;T+M9eB{VT<`aG7k
+zn)f@oE<`v`G!hdlR3b#c8xe|l8>DE0=1%!ff9^cb_kQR6zW4o|-#O>~uHt;XmYJ+I
+zK_C#zum>?m;Z6Mb7#YIa&@1aeAQowH-T|Hv{vWHXtnBFM=<e<w92^`Q8&j**TCH|w
+zW=5ye&3!WP0UQ|_Q79BrskFVly|A!wfjKuf7x4M{d8JaBnwknAkw}F7z<|f&A$<GE
+z#9}dz$7^nGX0cc_8jVh;L(;OcvZ|`8#>Pg#+uGV-5Af^tdQj5Y*@;G@7g7WV2lw^$
+z&Cbrcy1D|=)YK%ANCpN5N=ix~<n#IPDIy{wJ3E`nWcKv*3=a<jJ~cJf+S&>ZaQ652
+zkB^VPe*JoAXb4sSfdMK7NivzNx3?D%jYb1`<#IVVU0q$En!#X*L?S?ds;;h1AP_)}
+zAPmlOI2^#?IGhE}g|<Kzp-{LW0Lq7!LM=f-K_n8XzP_H#W&;}}s;H>Q%*+JYC=?2V
+z!GL%y77OKo5-yhu+n_ns)zwrgwWXy6T1_UCp`W0EKp^Dh<v}6PaFC%=sbDCRlamt@
+z6CeiW0^~4=G>fQ@x1sX<QD1+=qAyI$kd`a0R;^yM1V^rBzv>>;Oz3t0N?$cpk-RL7
+z-Curq>S*LLrm$bkV3lSj#D<6Y;{swYW|gxi%Zs*{e(6A+T4!*U^3;3jAJaPzMpw75
+z7$ut5KkB^M^5?QL0f}~RdGFoYzGCL-{5n-sF6Va91!l$rZes=YHif6k(V{Rhzm^#u
+zalK`;ZDwOVJvHuRU~uxaZ`Dc^TF`p)x#X>!QNDJ?g&SrFgh3=0gAPcLj)}XDS)x}j
+zQJ<v!mA=U?%l=1~tj%`B)z`KbFE+KKzBz$GdPW=@wWdy+ogj$E`&FZwuZ!Zp<C4}~
+zVm#p%keE^NFI+55ke}Hcsp&xT<5FtE)tFl*wILQcp5N@wHNu;kTknn!mb^C}u(Xb{
+zz`fa%H*memyTCaq1Ap2W>D!)vB`lDpEI*IgAvkB_L`bG*pdVVjPYM(XQGXx5K?%)o
+zLs2>$w}*(t!qJq_*t<Eng8LR58%v)#oqHZo6K-pf@#;>Nf;aRca6{9uQ_PEv<)W-?
+z(KCaVz2Og5`HT(EW0DOY#`%Z2w?rbt$vWfcc*OArS@cn<@fq^g9Guwf{7Pas%bMNJ
+zdS?{t^03BBAX+^7!xLN9zWoH>T^@;-lRUM^DZ}5M%WCC|WMSxw>0+B=^sbRM4jZXO
+z$_Lnf*!02(cHH5lbT?VLt;YvjoU;yD7jgjM%PiY#eFT3yJ0;{s)Z^`kQt+<!k~_Qu
+zviuCA6KQS^l4A0z$7lHCo-;d7g&3e}+$(1}x<hC;kGbLH_zAlm>$e4s;^kW?4ngm_
+zE`Q~cX8O<Z(zEsV8qXf?Mb7nT$Cn62o198j$sS3_dA5Umo!g_|H>CWM;Mc75nWk1-
+zsTCC62DdZ&CLU}r=+K8QH9PflBu(;$$CuS~(S5S#8@}fRZa&GnX#a%YkXXbwx5=MX
+z``wiJ|MZgXydqYc;eH`$&5TsFXJu)BBv++(-ld-NA|wj=+9rOa!u0;M{>s}ZN=&zg
+jp|o;zi!=ZHCR`6amaD0~y#7)m{38ggr!VHdM;P%x23q9L
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_home_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..96dc83e4a42d70c1b11ac5a55ea5eb8cd75e1e20
+GIT binary patch
+literal 980
+zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ=(EfiWY%C&U%V?H>iS4*_MFJ{MqE
+zmzM<j1v8iwPFQ>B+}+pje*SoQ_Tb9?Tpg9&|JF;%JijfpWO-*ypo^KYc~ESA_nHsA
+ztz3e$KC_1!6n_!c@R_*xN!py_HCyTq=gggUaniy|?MuCzA69H^h|Zp|b=B<p2PGc`
+z0>b30*|@*0n4jWq;gIy|zKGh99kpj}USHgEp;$&A80||uT^vIyZoR$k8h+S8g!O?F
+zcj^bHLXDPyjKZ$qJ6m_`-hKM-Z=Y)^yB^s@+{vH0dq%aAaitu;AQIT=<@xp3rAvP$
+zy;7MXy;6S{7k&Q3%$mf?)m#uB5~Fl^!4@93r=m)tT64E<TJ6;MO6v5gt#7SPb6q!g
+zS=4*(tJ=ib0ZZOj6rVo7V5@I<#(RMk0++cf?<&vlvtrdMVZ3YmE^z(23+e$2<s}SK
+z3ljnsIEfmhoN8+nY~)&eV1{Nl6Oi%vK#S&VmSrqjKFn8_<*>~VU17l9;(OC(gF?VT
+zew|sHRA+K^s)$ZwynjDjB9%2Z@o9hj@z9yqKg!oksmhKrP8D1bl-3+)o+@o5{UvQu
+za+deA^S<)eZhOAF(C5HfE5hn~GjCG+m+o&3f0++AEUdr7$EqdsvefBVI!p9|LmNK}
+z*BAXVwz%BS@myD^`ADnrrX%|0>yoZt>&?Br{aWc8JyVg;b6@KwX1@Ay&*p-y%_*L#
+z{^ysm=`T&%{PpeY3#V^a$E?)Zo3}Wqvw!=8=ht19w|5|cm|EtWFQ%k?JmTvKOfn3f
+Lu6{1-oD!M<_NCyP
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..4f0d314e2621d018c3cd2e4267cf4cf82a78943f
+GIT binary patch
+literal 278
+zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ+K~IR*HHxB_W3aOlvXS731D$dNyP
+z{`~&^8>ry@`}c3(z6CO@t*tk0+O&D|W?NfZAou_O|I!nsR|8q1B|(0{3``sX!dw~0
+z&!m6(D0J#1t5jH`B>TrxD!+gV@;qG}Ln>~)y?T=OumO*&<LOWDj(nQ-FWQ&&(?pJ@
+znOy%Gk7P>$)d4|WP*!pH)Y~Ek3+0ck%$oDNf%ERC$_@LN)Si65+@j0wqw%{iOg5Zz
+u=kcQOsZZh^l}((KO_)H0lQP7Be}}|<Jmh~yiM-bb33$5txvX<aXaWF$9A~fq
+
+literal 0
+HcmV?d00001
+
+diff --git a/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png b/packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..f53ec649e615e8491fb6abb63d169ab7e0faa1ce
+GIT binary patch
+literal 205
+zcmeAS@N?(olHy`uVBq!ia0vp^O(4v{3?%p7eQ+K~DF*n2xB}^ZynuIaZ52=vS4ogx
+zFoXa0-5=lXWwUX~o_?MiC>rSL;uunK>+RLuyayBnTpaC=HT>3}!PR$SSH`j?-mt2r
+zKs7+%uwa{9mTBst&#^sIIN#?w`Oh@C&bRjEiUzlg7B>c|g@RIyV08!V`R32zx~(4j
+Q*9XM+boFyt=akR{0CQqV3jhEB
+
+literal 0
+HcmV?d00001
+
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch
+++ b/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch
@ -0,0 +1,26 @@
+From aa14e5441dbe507174a4c71e05c8d45bd3bb6fe3 Mon Sep 17 00:00:00 2001
+From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com>
+Date: Thu, 30 Jan 2020 22:20:54 +0200
+Subject: [PATCH 02/21] Disable Bluetooth by default
+
+Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
+---
+ packages/SettingsProvider/res/values/defaults.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
+index 7732da40aac2..1d2c343a4514 100644
+--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
+@@ -36,7 +36,7 @@
+     <fraction name="def_window_transition_scale">100%</fraction>
+     <bool name="def_haptic_feedback">true</bool>
+ 
+-    <bool name="def_bluetooth_on">true</bool>
+    <bool name="def_bluetooth_on">false</bool>
+     <bool name="def_wifi_display_on">false</bool>
+     <bool name="def_install_non_market_apps">false</bool>
+     <!-- 0 == off, 3 == on -->
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
+++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
@ -0,0 +1,28 @@
+From 50fe4863c4bb15cae66c8e177b6f83f0eb913d2c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 27 Sep 2021 16:30:00 +0000
+Subject: [PATCH 03/21] Disable cursor drag by default for editable TextViews
+
+Requested by @TadiT7
+
+Change-Id: Id54e38ee418174af8cde4113c849bc292f5fc96d
+---
+ core/java/android/widget/WidgetFlags.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/java/android/widget/WidgetFlags.java b/core/java/android/widget/WidgetFlags.java
+index fb40ee5ec843..c0c6fb6e9431 100644
+--- a/core/java/android/widget/WidgetFlags.java
+++ b/core/java/android/widget/WidgetFlags.java
+@@ -38,7 +38,7 @@ public final class WidgetFlags {
+     /**
+      * Default value for the flag {@link #ENABLE_CURSOR_DRAG_FROM_ANYWHERE}.
+      */
+-    public static final boolean ENABLE_CURSOR_DRAG_FROM_ANYWHERE_DEFAULT = true;
+    public static final boolean ENABLE_CURSOR_DRAG_FROM_ANYWHERE_DEFAULT = false;
+ 
+     /**
+      * Threshold for the direction of a swipe gesture in order for it to be handled as a cursor drag
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
+++ b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
@ -0,0 +1,47 @@
+From 6ac4efcca60eedf745d66a9bb4fb0cec2bb1623a Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Fri, 22 Mar 2019 00:41:20 +0800
+Subject: [PATCH 04/21] Disable FP lockouts
+
+Both timed and permanent lockouts - GET THE FUCK OUT
+Now targeting LockoutFramework, introduced in Android 12
+
+Change-Id: I2d4b091f3546d4d7903bfb4d5585629212dc9915
+---
+ .../fingerprint/hidl/LockoutFrameworkImpl.java  | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+index a0befea8e085..325e1fcecc2b 100644
+--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/LockoutFrameworkImpl.java
+@@ -100,25 +100,10 @@ public class LockoutFrameworkImpl implements LockoutTracker {
+         mLockoutResetCallback.onLockoutReset(userId);
+     }
+ 
+-    void addFailedAttemptForUser(int userId) {
+-        mFailedAttempts.put(userId, mFailedAttempts.get(userId, 0) + 1);
+-        mTimedLockoutCleared.put(userId, false);
+-
+-        if (getLockoutModeForUser(userId) != LOCKOUT_NONE) {
+-            scheduleLockoutResetForUser(userId);
+-        }
+-    }
+    void addFailedAttemptForUser(int userId) {}
+ 
+     @Override
+     public @LockoutMode int getLockoutModeForUser(int userId) {
+-        final int failedAttempts = mFailedAttempts.get(userId, 0);
+-        if (failedAttempts >= MAX_FAILED_ATTEMPTS_LOCKOUT_PERMANENT) {
+-            return LOCKOUT_PERMANENT;
+-        } else if (failedAttempts > 0
+-                && !mTimedLockoutCleared.get(userId, false)
+-                && (failedAttempts % MAX_FAILED_ATTEMPTS_LOCKOUT_TIMED == 0)) {
+-            return LOCKOUT_TIMED;
+-        }
+         return LOCKOUT_NONE;
+     }
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch
+++ b/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch
@ -0,0 +1,44 @@
+From 866ff474c40b43fa97d684a4776ab4a342ef02e0 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 3 Jul 2022 00:08:42 +0000
+Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast
+
+Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
+---
+ .../server/usage/AppStandbyController.java    | 20 +------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+index 9e3e3553c125..ec43489d70e4 100644
+--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+@@ -1738,25 +1738,7 @@ public class AppStandbyController
+                         .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
+ 
+                 if (isForcedByUser) {
+-                    // Only user force can bypass the delay restriction. If the user forced the
+-                    // app into the RESTRICTED bucket, then a toast confirming the action
+-                    // shouldn't be surprising.
+-                    // Exclude REASON_SUB_FORCED_USER_FLAG_INTERACTION since the RESTRICTED bucket
+-                    // isn't directly visible in that flow.
+-                    if (Build.IS_DEBUGGABLE
+-                            && (reason & REASON_SUB_MASK)
+-                            != REASON_SUB_FORCED_USER_FLAG_INTERACTION) {
+-                        Toast.makeText(mContext,
+-                                // Since AppStandbyController sits low in the lock hierarchy,
+-                                // make sure not to call out with the lock held.
+-                                mHandler.getLooper(),
+-                                mContext.getResources().getString(
+-                                        R.string.as_app_forced_to_restricted_bucket, packageName),
+-                                Toast.LENGTH_SHORT)
+-                                .show();
+-                    } else {
+-                        Slog.i(TAG, packageName + " restricted by user");
+-                    }
+                    Slog.i(TAG, packageName + " restricted by user");
+                 } else {
+                     final long timeUntilRestrictPossibleMs = app.lastUsedByUserElapsedTime
+                             + mInjector.getAutoRestrictedBucketDelayMs() - elapsedRealtime;
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch
+++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch
@ -0,0 +1,142 @@
+From cc238348eba9c2223ee7e423612a513c70aa12e6 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 2 Sep 2021 16:15:19 +0000
+Subject: [PATCH 06/21] Keyguard: Adjust clock style
+
+Thinner font, less padding and unintrusive colors
+
+Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910
+---
+ .../SystemUI/res-keyguard/layout/keyguard_clock_switch.xml | 7 ++++---
+ .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml   | 2 +-
+ packages/SystemUI/res-keyguard/values/dimens.xml           | 6 +++---
+ packages/SystemUI/res-keyguard/values/styles.xml           | 2 --
+ packages/SystemUI/res/layout/keyguard_status_bar.xml       | 2 +-
+ packages/SystemUI/res/values/styles.xml                    | 4 ++--
+ .../src/com/android/keyguard/AnimatableClockView.kt        | 2 +-
+ 7 files changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+index 87a9825af1cb..93e827ac540e 100644
+--- a/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml
+@@ -38,10 +38,10 @@
+             android:layout_gravity="start"
+             android:gravity="start"
+             android:textSize="@dimen/clock_text_size"
+-            android:fontFamily="@font/clock"
+            android:fontFamily="sans-serif-thin"
+             android:elegantTextHeight="false"
+             android:singleLine="true"
+-            android:fontFeatureSettings="pnum"
+            android:fontFeatureSettings="tnum"
+             chargeAnimationDelay="350"
+             dozeWeight="200"
+             lockScreenWeight="400"
+@@ -60,9 +60,10 @@
+             android:layout_gravity="center"
+             android:gravity="center_horizontal"
+             android:textSize="@dimen/large_clock_text_size"
+-            android:fontFamily="@font/clock"
+            android:fontFamily="sans-serif-thin"
+             android:typeface="monospace"
+             android:elegantTextHeight="false"
+            android:fontFeatureSettings="tnum"
+             chargeAnimationDelay="200"
+             dozeWeight="200"
+             lockScreenWeight="400"
+diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+index 7c5dbc247428..64657547621f 100644
+--- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml
+@@ -38,7 +38,7 @@
+               android:id="@+id/row"
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+-              android:orientation="horizontal"
+              android:orientation="vertical"
+               android:gravity="start"
+     />
+ </com.android.keyguard.KeyguardSliceView>
+diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
+index 77f1803523a8..ed0bca225550 100644
+--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
+@@ -91,10 +91,10 @@
+     <dimen name="num_pad_key_margin_end">12dp</dimen>
+ 
+     <!-- additional offset for clock switch area items -->
+-    <dimen name="clock_padding_start">28dp</dimen>
+-    <dimen name="below_clock_padding_start">32dp</dimen>
+    <dimen name="clock_padding_start">22dp</dimen>
+    <dimen name="below_clock_padding_start">28dp</dimen>
+     <dimen name="below_clock_padding_end">16dp</dimen>
+-    <dimen name="below_clock_padding_start_icons">28dp</dimen>
+    <dimen name="below_clock_padding_start_icons">22dp</dimen>
+ 
+     <!-- Proportion of the screen height to use to set the maximum height of the bouncer to when
+          the device is in the DEVICE_POSTURE_HALF_OPENED posture, for the PIN/pattern entry. 0 will
+diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
+index 625ffd3aa3ec..0f7d931f4fdc 100644
+--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
+@@ -117,8 +117,6 @@
+         <item name="android:ellipsize">end</item>
+         <item name="android:maxLines">2</item>
+         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+-        <item name="android:shadowColor">@color/keyguard_shadow_color</item>
+-        <item name="android:shadowRadius">?attr/shadowRadius</item>
+     </style>
+ 
+     <style name="TextAppearance.Keyguard.Secondary">
+diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+index e47eed9ea04a..fe4f0a6e1104 100644
+--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+@@ -92,7 +92,7 @@
+         android:gravity="center_vertical"
+         android:ellipsize="marquee"
+         android:textDirection="locale"
+-        android:textAppearance="@style/TextAppearance.StatusBar.Clock"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+         android:textColor="?attr/wallpaperTextColorSecondary"
+         android:singleLine="true"
+         systemui:showMissingSim="true"
+diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
+index 4d8e3529c5b5..15e3738f2a86 100644
+--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
+@@ -296,7 +296,7 @@
+         <item name="darkIconTheme">@style/DualToneDarkTheme</item>
+         <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>
+         <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>
+-        <item name="wallpaperTextColorAccent">@color/material_dynamic_primary90</item>
+        <item name="wallpaperTextColorAccent">@*android:color/primary_text_material_dark</item>
+         <item name="android:colorError">@*android:color/error_color_material_dark</item>
+         <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
+         <item name="passwordStyle">@style/PasswordTheme</item>
+@@ -312,7 +312,7 @@
+     <style name="Theme.SystemUI.LightWallpaper">
+         <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>
+         <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>
+-        <item name="wallpaperTextColorAccent">@color/material_dynamic_secondary40</item>
+        <item name="wallpaperTextColorAccent">@*android:color/primary_text_material_light</item>
+         <item name="android:colorError">@*android:color/error_color_material_light</item>
+         <item name="shadowRadius">0</item>
+ 
+diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt
+index e22386e78359..a4154c2bcd8e 100644
+--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt
+@@ -126,7 +126,7 @@ class AnimatableClockView @JvmOverloads constructor(
+     fun refreshTime() {
+         time.timeInMillis = System.currentTimeMillis()
+         contentDescription = DateFormat.format(descFormat, time)
+-        val formattedText = DateFormat.format(format, time)
+        val formattedText = DateFormat.format(format, time).toString() + ' '
+         // Setting text actually triggers a layout pass (because the text view is set to
+         // wrap_content width and TextView always relayouts for this). Avoid needless
+         // relayout if the text didn't actually change.
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
+++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
@ -0,0 +1,43 @@
+From 9a957afc1a032b17ab055384694ac5c018a423ac Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 2 Nov 2019 06:41:03 +0000
+Subject: [PATCH 07/21] Keyguard: Hide padlock unless UDFPS is in use
+
+Fair enough Google, but don't give me that otherwise
+
+Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
+---
+ .../com/android/keyguard/LockIconViewController.java | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+index 680b8bd70837..9a59062fcaa9 100644
+--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+@@ -254,20 +254,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
+             return;
+         }
+ 
+-        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon && !mShowLockIcon
+        boolean wasShowingFpIcon = mUdfpsEnrolled && !mShowUnlockIcon
+                 && !mShowAodUnlockedIcon && !mShowAodLockIcon;
+-        mShowLockIcon = !mCanDismissLockScreen && !mUserUnlockedWithBiometric && isLockScreen()
+-                && (!mUdfpsEnrolled || !mRunningFPS);
+-        mShowUnlockIcon = (mCanDismissLockScreen || mUserUnlockedWithBiometric) && isLockScreen();
+        mShowUnlockIcon = (mCanDismissLockScreen || mUserUnlockedWithBiometric) && isLockScreen() && mUdfpsEnrolled;
+         mShowAodUnlockedIcon = mIsDozing && mUdfpsEnrolled && !mRunningFPS && mCanDismissLockScreen;
+         mShowAodLockIcon = mIsDozing && mUdfpsEnrolled && !mRunningFPS && !mCanDismissLockScreen;
+ 
+         final CharSequence prevContentDescription = mView.getContentDescription();
+-        if (mShowLockIcon) {
+-            mView.updateIcon(ICON_LOCK, false);
+-            mView.setContentDescription(mLockedLabel);
+-            mView.setVisibility(View.VISIBLE);
+-        } else if (mShowUnlockIcon) {
+        if (mShowUnlockIcon) {
+             if (wasShowingFpIcon) {
+                 // fp icon was shown by UdfpsView, and now we still want to animate the transition
+                 // in this drawable
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0008-Keyguard-Never-switch-to-large-clock.patch
+++ b/patches_platform_personal/frameworks_base/0008-Keyguard-Never-switch-to-large-clock.patch
@ -0,0 +1,28 @@
+From 7f3d384e69834189fb54e74c2c38efd3a462715b Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 1 Sep 2021 14:41:53 +0000
+Subject: [PATCH 08/21] Keyguard: Never switch to large clock
+
+It looks alright actually, but as always breaks under landscape
+
+Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
+---
+ .../src/com/android/keyguard/KeyguardClockSwitchController.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+index 5c9dd5ec26e7..08e006fd3cca 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+@@ -454,7 +454,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
+ 
+     private void updateDoubleLineClock() {
+         mCanShowDoubleLineClock = mSecureSettings.getIntForUser(
+-            Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 1,
+            Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK, 0,
+                 UserHandle.USER_CURRENT) != 0;
+ 
+         if (!mCanShowDoubleLineClock) {
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch
+++ b/patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch
@ -0,0 +1,133 @@
+From 200440c973f689f9dd294fb367015d21dd3c870d Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 2 Nov 2019 08:31:36 +0000
+Subject: [PATCH 09/21] Keyguard: Refine indication text
+
+Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
+---
+ packages/SystemUI/res-keyguard/values/styles.xml     |  2 --
+ .../SystemUI/res/layout/keyguard_bottom_area.xml     |  1 +
+ packages/SystemUI/res/values/dimens.xml              |  3 +--
+ .../KeyguardIndicationRotateTextViewController.java  | 12 +++++++++++-
+ .../statusbar/KeyguardIndicationController.java      |  7 ++++---
+ .../statusbar/phone/KeyguardIndicationTextView.java  |  2 +-
+ 6 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
+index 0f7d931f4fdc..19004a4c28da 100644
+--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
+@@ -132,8 +132,6 @@
+         <item name="android:maxLines">1</item>
+         <item name="android:gravity">center</item>
+         <item name="android:textColor">?attr/wallpaperTextColor</item>
+-        <item name="android:shadowColor">@color/keyguard_shadow_color</item>
+-        <item name="android:shadowRadius">?attr/shadowRadius</item>
+     </style>
+ 
+     <style name="TextAppearance.Keyguard.BottomArea.Button">
+diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+index 8f8993f3c8d9..be49748b8fb8 100644
+--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+@@ -35,6 +35,7 @@
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:gravity="center"
+            android:minHeight="48dp"
+             android:paddingStart="@dimen/keyguard_indication_text_padding"
+             android:paddingEnd="@dimen/keyguard_indication_text_padding"
+             android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index bd34e2fa80e1..bd56bf520d5b 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -717,11 +717,10 @@
+     <dimen name="keyguard_lock_height">42dp</dimen>
+     <dimen name="keyguard_lock_padding">20dp</dimen>
+ 
+-    <dimen name="keyguard_indication_margin_bottom">32dp</dimen>
+    <dimen name="keyguard_indication_margin_bottom">16dp</dimen>
+     <dimen name="lock_icon_margin_bottom">110dp</dimen>
+     <dimen name="ambient_indication_margin_bottom">71dp</dimen>
+ 
+-
+     <!-- How much two taps can be apart to still be recognized as a double tap on the lockscreen -->
+     <dimen name="double_tap_slop">32dp</dimen>
+ 
+diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+index 5aedbdc20b31..6f4405a8329c 100644
+--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
+@@ -216,12 +216,22 @@ public class KeyguardIndicationRotateTextViewController extends
+     }
+ 
+     /**
+-     * @return true if there are available indications to show
+     * @return true if there are available non-resting indications to show.
+      */
+     public boolean hasIndications() {
+        if (hasIndication(INDICATION_TYPE_RESTING)) {
+            return mIndicationMessages.keySet().size() > 1;
+        }
+         return mIndicationMessages.keySet().size() > 0;
+     }
+ 
+    /**
+     * @return true if there is an indication of the following type.
+     */
+    public boolean hasIndication(@IndicationType int type) {
+        return mIndicationMessages.containsKey(type);
+    }
+
+     /**
+      * Clears all messages in the queue and sets the current message to an empty string.
+      */
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+index 1fb771ef2991..10f14cd17944 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+@@ -240,10 +240,12 @@ public class KeyguardIndicationController {
+             public void handleMessage(Message msg) {
+                 if (msg.what == MSG_HIDE_TRANSIENT) {
+                     hideTransientIndication();
+                    updateLockScreenIndications(false /* animate */, KeyguardUpdateMonitor.getCurrentUser());
+                 } else if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) {
+                     showActionToUnlock();
+                 } else if (msg.what == MSG_HIDE_BIOMETRIC_MESSAGE) {
+                     hideBiometricMessage();
+                    updateLockScreenIndications(false /* animate */, KeyguardUpdateMonitor.getCurrentUser());
+                 }
+             }
+         };
+@@ -544,12 +546,11 @@ public class KeyguardIndicationController {
+     }
+ 
+     private void updateLockScreenRestingMsg() {
+-        if (!TextUtils.isEmpty(mRestingIndication)
+-                && !mRotateTextViewController.hasIndications()) {
+        if (!mRotateTextViewController.hasIndications()) {
+             mRotateTextViewController.updateIndication(
+                     INDICATION_TYPE_RESTING,
+                     new KeyguardIndication.Builder()
+-                            .setMessage(mRestingIndication)
+                            .setMessage(mContext.getResources().getString(R.string.keyguard_unlock))
+                             .setTextColor(mInitialTextColorState)
+                             .build(),
+                     false);
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+index 339f371c0d12..bd1432303463 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
+@@ -44,7 +44,7 @@ public class KeyguardIndicationTextView extends TextView {
+     @StyleRes
+     private static int sButtonStyleId = R.style.TextAppearance_Keyguard_BottomArea_Button;
+ 
+-    private boolean mAnimationsEnabled = true;
+    private boolean mAnimationsEnabled = false;
+     private CharSequence mMessage;
+     private KeyguardIndication mKeyguardIndicationInfo;
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
+++ b/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
@ -0,0 +1,263 @@
+From e1f723f9b623d4b9f7002aafa06446b5b39d7f3b Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 20 Mar 2021 10:35:14 +0000
+Subject: [PATCH 10/21] Keyguard/UI: Fix status bar / quick settings margins
+ and paddings
+
+Last revised on 2022/09/24, targeting T
+
+The way I think SB/QS margins/paddings should work:
+- Devices with left notch: [notch_definition][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
+- Devices with center or no notch: [rounded_corner_content_padding][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding]
+Key point being:
+- SB (including keyguard) and QS should always act uniformly
+- Notch definition should only be the notch itself, without additional padding
+- Instead, these paddings should be covered by status_bar_padding_{start|end}
+As a result, below changes have been made:
+- Change keyguard_carrier_text_margin into a padding
+- Link keyguard paddings to status_bar_padding_{start|end}
+- Add status_bar_padding_{start|end} to quick settings header
+- Remove several unnecessary margins and paddings
+- Animate padding for new QS clock in s-qpr1
+
+Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
+---
+ .../res/layout/keyguard_status_bar.xml        |  2 +-
+ .../res/layout/quick_qs_status_icons.xml      |  6 ---
+ .../quick_status_bar_header_date_privacy.xml  |  5 +-
+ .../SystemUI/res/values-sw600dp/dimens.xml    |  3 --
+ packages/SystemUI/res/values/dimens.xml       |  2 +-
+ .../systemui/qs/QuickStatusBarHeader.java     | 50 ++++++++++++-------
+ .../phone/KeyguardStatusBarView.java          |  7 ---
+ 7 files changed, 35 insertions(+), 40 deletions(-)
+
+diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+index fe4f0a6e1104..c8936a195a49 100644
+--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
+@@ -87,7 +87,7 @@
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:paddingTop="@dimen/status_bar_padding_top"
+-        android:layout_marginStart="@dimen/keyguard_carrier_text_margin"
+        android:paddingStart="@dimen/keyguard_carrier_text_margin"
+         android:layout_toStartOf="@id/system_icons_container"
+         android:gravity="center_vertical"
+         android:ellipsize="marquee"
+diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+index 7a370d8cbc48..0247eebea131 100644
+--- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml
+@@ -21,7 +21,6 @@
+     android:layout_height="@*android:dimen/quick_qs_offset_height"
+     android:clipChildren="false"
+     android:clipToPadding="false"
+-    android:minHeight="@dimen/qs_header_row_min_height"
+     android:clickable="false"
+     android:focusable="true"
+     android:theme="@style/QSHeaderTheme">
+@@ -39,10 +38,7 @@
+             android:id="@+id/clock"
+             android:layout_width="wrap_content"
+             android:layout_height="match_parent"
+-            android:minHeight="@dimen/qs_header_row_min_height"
+             android:gravity="center_vertical|start"
+-            android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
+-            android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
+             android:singleLine="true"
+             android:textAppearance="@style/TextAppearance.QS.Status" />
+ 
+@@ -50,7 +46,6 @@
+             android:id="@+id/date_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="match_parent"
+-            android:layout_marginStart="@dimen/status_bar_left_clock_end_padding"
+             android:gravity="center_vertical|start"
+             android:singleLine="true"
+             android:textAppearance="@style/TextAppearance.QS.Status"
+@@ -64,7 +59,6 @@
+         android:layout_width="0dp"
+         android:layout_height="match_parent"
+         android:layout_weight="1"
+-        android:minHeight="@dimen/qs_header_row_min_height"
+         android:minWidth="48dp"
+         android:layout_marginStart="8dp"
+         android:layout_gravity="end|center_vertical"
+diff --git a/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml b/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
+index 60bc3732cde0..6ba9382bea94 100644
+--- a/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
+++ b/packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml
+@@ -25,14 +25,12 @@
+     android:gravity="center"
+     android:layout_gravity="top"
+     android:orientation="horizontal"
+-    android:clickable="true"
+-    android:minHeight="48dp">
+    android:clickable="true">
+ 
+     <FrameLayout
+         android:id="@+id/date_container"
+         android:layout_width="0dp"
+         android:layout_height="match_parent"
+-        android:minHeight="48dp"
+         android:layout_weight="1"
+         android:gravity="center_vertical|start" >
+ 
+@@ -64,7 +62,6 @@
+         android:id="@+id/privacy_container"
+         android:layout_width="0dp"
+         android:layout_height="match_parent"
+-        android:minHeight="48dp"
+         android:layout_weight="1"
+         android:gravity="center_vertical|end" >
+ 
+diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
+index 008299bd9b1c..271c6d3de672 100644
+--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
+@@ -27,9 +27,6 @@
+     <!-- The width of user avatar when on Keyguard -->
+     <dimen name="multi_user_avatar_keyguard_size">30dp</dimen>
+ 
+-    <!-- Margin on the left side of the carrier text on Keyguard -->
+-    <dimen name="keyguard_carrier_text_margin">24dp</dimen>
+-
+     <!-- The width/height of the phone/camera/unlock icon on keyguard. -->
+     <dimen name="keyguard_affordance_height">80dp</dimen>
+     <dimen name="keyguard_affordance_width">120dp</dimen>
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index bd56bf520d5b..6e8130c9d7ab 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -693,7 +693,7 @@
+     <dimen name="kg_framed_avatar_size">32dp</dimen>
+ 
+     <!-- Margin on the left side of the carrier text on Keyguard -->
+-    <dimen name="keyguard_carrier_text_margin">16dp</dimen>
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
+ 
+     <!-- Additional translation (downwards) for appearing notifications when going to the full shade
+          from Keyguard. -->
+diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+index 110d3045c535..1c0f260ef928 100644
+--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+@@ -100,6 +100,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+     private StatusBarContentInsetsProvider mInsetsProvider;
+ 
+     private int mRoundedCornerPadding = 0;
+    private int mStatusBarPaddingStart;
+    private int mStatusBarPaddingEnd;
+    private int mHeaderPaddingLeft;
+    private int mHeaderPaddingRight;
+     private int mWaterfallTopInset;
+     private int mCutOutPaddingLeft;
+     private int mCutOutPaddingRight;
+@@ -257,6 +261,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+         mRoundedCornerPadding = resources.getDimensionPixelSize(
+                 R.dimen.rounded_corner_content_padding);
+ 
+        mStatusBarPaddingStart = resources.getDimensionPixelSize(
+                R.dimen.status_bar_padding_start);
+        mStatusBarPaddingEnd = resources.getDimensionPixelSize(
+                R.dimen.status_bar_padding_end);
+
+         int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext);
+ 
+         mDatePrivacyView.getLayoutParams().height =
+@@ -347,6 +356,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+                 .addFloat(mDateView, "alpha", 0, 0, 1)
+                 .addFloat(mClockDateView, "alpha", 1, 0, 0)
+                 .addFloat(mQSCarriers, "alpha", 0, 1)
+                // Use statusbar paddings when collapsed, align with QS when expanded, and animate translation
+                .addFloat(mClockContainer, "translationX", mHeaderPaddingLeft + mStatusBarPaddingStart, 0)
+                .addFloat(mRightLayout, "translationX", -(mHeaderPaddingRight + mStatusBarPaddingEnd), 0)
+                 .setListener(new TouchAnimator.ListenerAdapter() {
+                     @Override
+                     public void onAnimationAtEnd() {
+@@ -452,8 +464,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+                 .getStatusBarContentInsetsForCurrentRotation();
+         boolean hasCornerCutout = mInsetsProvider.currentRotationHasCornerCutout();
+ 
+-        mDatePrivacyView.setPadding(sbInsets.first, 0, sbInsets.second, 0);
+-        mStatusIconsView.setPadding(sbInsets.first, 0, sbInsets.second, 0);
+         LinearLayout.LayoutParams datePrivacySeparatorLayoutParams =
+                 (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams();
+         LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams =
+@@ -517,34 +527,38 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
+     private void updateHeadersPadding() {
+         setContentMargins(mDatePrivacyView, 0, 0);
+         setContentMargins(mStatusIconsView, 0, 0);
+-        int paddingLeft = 0;
+-        int paddingRight = 0;
+ 
+         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
+        // Note: these are supposedly notification_side_paddings
+         int leftMargin = lp.leftMargin;
+         int rightMargin = lp.rightMargin;
+ 
+         // The clock might collide with cutouts, let's shift it out of the way.
+-        // We only do that if the inset is bigger than our own padding, since it's nicer to
+-        // align with
+-        if (mCutOutPaddingLeft > 0) {
+-            // if there's a cutout, let's use at least the rounded corner inset
+-            int cutoutPadding = Math.max(mCutOutPaddingLeft, mRoundedCornerPadding);
+-            paddingLeft = Math.max(cutoutPadding - leftMargin, 0);
+        // Margin will be the reference point of paddings/translations
+        // and will have to be subtracted from cutout paddings
+        boolean headerPaddingUpdated = false;
+        int headerPaddingLeft = Math.max(mCutOutPaddingLeft, mRoundedCornerPadding) - leftMargin;
+        if (headerPaddingLeft != mHeaderPaddingLeft) {
+            mHeaderPaddingLeft = headerPaddingLeft;
+            headerPaddingUpdated = true;
+         }
+-        if (mCutOutPaddingRight > 0) {
+-            // if there's a cutout, let's use at least the rounded corner inset
+-            int cutoutPadding = Math.max(mCutOutPaddingRight, mRoundedCornerPadding);
+-            paddingRight = Math.max(cutoutPadding - rightMargin, 0);
+        int headerPaddingRight = Math.max(mCutOutPaddingRight, mRoundedCornerPadding) - rightMargin;
+        if (headerPaddingRight != mHeaderPaddingRight) {
+            mHeaderPaddingRight = headerPaddingRight;
+            headerPaddingUpdated = true;
+         }
+ 
+-        mDatePrivacyView.setPadding(paddingLeft,
+        // Update header animator with new paddings
+        if (headerPaddingUpdated) {
+            updateAnimators();
+        }
+        mDatePrivacyView.setPadding(mHeaderPaddingLeft + mStatusBarPaddingStart,
+                 mWaterfallTopInset,
+-                paddingRight,
+                mHeaderPaddingRight + mStatusBarPaddingEnd,
+                 0);
+-        mStatusIconsView.setPadding(paddingLeft,
+        mStatusIconsView.setPadding(0,
+                 mWaterfallTopInset,
+-                paddingRight,
+                0,
+                 0);
+     }
+ 
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+index 5119b8f95aa8..090fa7aac340 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+@@ -156,14 +156,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
+         mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                 getResources().getDimensionPixelSize(
+                         com.android.internal.R.dimen.text_size_small_material));
+-        lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams();
+ 
+-        int marginStart = calculateMargin(
+-                getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin),
+-                mPadding.first);
+-        lp.setMarginStart(marginStart);
+-
+-        mCarrierLabel.setLayoutParams(lp);
+         updateKeyguardStatusBarHeight();
+     }
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
+++ b/patches_platform_personal/frameworks_base/0011-Replace-NTP-server.patch
@ -0,0 +1,26 @@
+From a5d16d114a7340f3757d8f35b93792b3abc3f99b 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 11/21] 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 c62cce393ff0..5494b3e2a7ab 100644
+--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
+@@ -2349,7 +2349,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">64800000</integer>
+     <!-- Try-again polling interval in milliseconds, in case the network request failed -->
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
+++ b/patches_platform_personal/frameworks_base/0012-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch
@ -0,0 +1,44 @@
+From f655579eaa44cb3c96a47a06c41fb732e598f554 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 31 May 2022 00:00:08 +0000
+Subject: [PATCH 12/21] Revert "SystemUI: Add left padding for keyguard slices"
+
+This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
+---
+ .../src/com/android/keyguard/KeyguardSliceView.java      | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+index 31d22eb38a24..65a71664e245 100644
+--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
+@@ -49,7 +49,6 @@ import com.android.internal.graphics.ColorUtils;
+ import com.android.settingslib.Utils;
+ import com.android.systemui.R;
+ import com.android.systemui.animation.Interpolators;
+-import com.android.systemui.keyguard.KeyguardSliceProvider;
+ import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;
+ 
+ import java.io.PrintWriter;
+@@ -446,15 +445,13 @@ public class KeyguardSliceView extends LinearLayout {
+ 
+         private void updatePadding() {
+             boolean hasText = !TextUtils.isEmpty(getText());
+-            boolean isDate = Uri.parse(KeyguardSliceProvider.KEYGUARD_DATE_URI).equals(getTag());
+             int padding = (int) getContext().getResources()
+                     .getDimension(R.dimen.widget_horizontal_padding) / 2;
+-            int iconPadding = (int) mContext.getResources()
+-                    .getDimension(R.dimen.widget_icon_padding);
+             // orientation is vertical, so add padding to top & bottom
+-            setPadding(!isDate ? iconPadding : 0, padding, 0, hasText ? padding : 0);
+            setPadding(0, padding, 0, hasText ? padding : 0);
+ 
+-            setCompoundDrawablePadding(iconPadding);
+            setCompoundDrawablePadding((int) mContext.getResources()
+                    .getDimension(R.dimen.widget_icon_padding));
+         }
+ 
+         @Override
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch
+++ b/patches_platform_personal/frameworks_base/0013-Revert-Update-RAT-icons-to-match-Silk-design.patch
@ -0,0 +1,273 @@
+From 267d70e75c9efe6a24093c3d65ef56ffb9860d4f 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 13/21] Revert "Update RAT icons to match Silk design"
+
+This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
+---
+ .../res/drawable/ic_3g_mobiledata.xml         | 19 ++++++-----
+ .../res/drawable/ic_4g_mobiledata.xml         | 19 ++++++-----
+ .../res/drawable/ic_5g_mobiledata.xml         | 20 +++++------
+ .../res/drawable/ic_5g_uc_mobiledata.xml      | 33 -------------------
+ .../res/drawable/ic_5g_uw_mobiledata.xml      | 33 -------------------
+ .../res/drawable/ic_carrier_wifi.xml          | 15 +++++----
+ .../res/drawable/ic_lte_mobiledata.xml        | 23 +++++++------
+ .../res/drawable/stat_sys_roaming_large.xml   | 10 +++---
+ 8 files changed, 59 insertions(+), 113 deletions(-)
+ delete mode 100644 packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml
+ delete mode 100644 packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml
+
+diff --git a/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml
+index 413a3873f438..0c942bdf993c 100644
+--- a/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml
+@@ -14,14 +14,17 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="21dp"
+-        android:height="16dp"
+-        android:viewportWidth="21.0"
+-        android:viewportHeight="16.0">
+    android:width="12.35dp"
+    android:height="15dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.9,7.88h0.77c0.5,0,0.88-0.15,1.15-0.46s0.4-0.72,0.4-1.25c0-1.17-0.45-1.75-1.35-1.75c-0.43,0-0.77,0.16-1.02,0.47 S1.49,5.62,1.49,6.13h-1.2c0-0.8,0.24-1.46,0.73-1.97s1.11-0.78,1.86-0.78c0.78,0,1.41,0.25,1.87,0.73S5.43,5.31,5.43,6.2 c0,0.46-0.12,0.89-0.36,1.29S4.52,8.18,4.14,8.37c0.94,0.35,1.41,1.12,1.41,2.33c0,0.89-0.25,1.6-0.74,2.12 c-0.49,0.53-1.14,0.79-1.94,0.79c-0.79,0-1.43-0.25-1.91-0.75c-0.49-0.5-0.73-1.17-0.73-2.01h1.21c0,0.53,0.13,0.95,0.38,1.26 c0.26,0.31,0.6,0.47,1.05,0.47c0.45,0,0.81-0.15,1.08-0.46s0.4-0.77,0.4-1.39c0-1.21-0.57-1.81-1.72-1.81H1.9V7.88z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M5.29,13.22c-0.57,0 -1.09,-0.11 -1.57,-0.34c-0.47,-0.22 -0.85,-0.54 -1.16,-0.95C2.25,11.52 2.07,11.01 2,10.42l1.47,-0.34c0.07,0.51 0.27,0.92 0.59,1.23c0.32,0.31 0.73,0.46 1.23,0.46c0.52,0 0.94,-0.15 1.26,-0.46c0.33,-0.31 0.49,-0.71 0.49,-1.22c0,-0.51 -0.18,-0.92 -0.53,-1.22c-0.35,-0.31 -0.8,-0.46 -1.36,-0.46H4.37V7.06h0.73c0.47,0 0.86,-0.13 1.18,-0.38c0.32,-0.26 0.48,-0.63 0.48,-1.11c0,-0.42 -0.14,-0.77 -0.41,-1.04C6.08,4.27 5.7,4.14 5.21,4.14c-0.43,0 -0.79,0.13 -1.08,0.38C3.85,4.76 3.67,5.08 3.6,5.48L2.17,5.3C2.23,4.81 2.4,4.38 2.67,4c0.27,-0.38 0.62,-0.69 1.05,-0.91c0.44,-0.22 0.94,-0.34 1.5,-0.34c0.62,0 1.15,0.12 1.6,0.35c0.45,0.23 0.79,0.55 1.04,0.95C8.1,4.46 8.23,4.9 8.23,5.4C8.23,6 8.1,6.48 7.84,6.81C7.58,7.14 7.29,7.4 6.97,7.6v0.08c0.46,0.2 0.84,0.5 1.13,0.91c0.3,0.4 0.45,0.93 0.45,1.58c0,0.58 -0.14,1.1 -0.42,1.55c-0.27,0.46 -0.65,0.82 -1.15,1.09C6.5,13.09 5.93,13.22 5.29,13.22z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.77,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26h-1.25 C12.47,5.82,12.3,5.33,12,4.98s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.59,6.37,8.58,7.4v2.03c0,1,0.19,1.77,0.57,2.31 c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59H10.7V8.52h3.07V12.24z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M14.44,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83c-0.38,-0.79 -0.57,-1.71 -0.57,-2.76c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11L17.3,6.01c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6h-1.41v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.78,13.07 15.17,13.22 14.44,13.22z"/>
+        android:pathData="M 0 0 H 14 V 17 H 0 V 0 Z" />
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml
+index 1de7d78ff5f2..535f3589ea6b 100644
+--- a/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml
+@@ -14,14 +14,17 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="22dp"
+-        android:height="16dp"
+-        android:viewportWidth="22.0"
+-        android:viewportHeight="16.0">
+    android:width="12.35dp"
+    android:height="15dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5.07,10.13h1.11v1.03H5.07v2.31H3.86v-2.31H0.1v-0.75l3.7-6.9h1.27V10.13z M1.44,10.13h2.42V5.4L1.44,10.13z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M2,10.98V9.81l4.28,-6.83h1.6v6.59h1.19v1.41H7.88V13H6.4v-2.02H2zM3.68,9.57H6.4V5.33H6.31L3.68,9.57z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.9,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26h-1.25 c-0.05-0.62-0.22-1.1-0.52-1.45s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.72,6.37,8.71,7.4v2.03 c0,1,0.19,1.77,0.57,2.31c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59h-1.82V8.52h3.07V12.24z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M15,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83c-0.38,-0.79 -0.57,-1.71 -0.57,-2.76c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27c-0.28,0.56 -0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6h-1.41v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C16.34,13.07 15.73,13.22 15,13.22z"/>
+        android:pathData="M 0 0 H 14 V 17 H 0 V 0 Z" />
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml
+index d961c6c2266f..2aa6e57f6f82 100644
+--- a/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml
+@@ -14,14 +14,14 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="21dp"
+-        android:height="16dp"
+-        android:viewportWidth="21.0"
+-        android:viewportHeight="16.0">
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M5.3,13.22c-0.57,0 -1.1,-0.11 -1.58,-0.34c-0.48,-0.22 -0.87,-0.55 -1.18,-0.98C2.24,11.47 2.06,10.93 2,10.3l1.48,-0.2c0.07,0.5 0.25,0.92 0.56,1.25c0.32,0.32 0.74,0.48 1.26,0.48c0.57,0 1.02,-0.18 1.34,-0.55c0.33,-0.37 0.49,-0.87 0.49,-1.48c0,-0.61 -0.16,-1.09 -0.49,-1.46C6.32,7.96 5.88,7.78 5.32,7.78C5,7.78 4.7,7.85 4.42,8C4.15,8.14 3.93,8.33 3.76,8.56L2.28,7.92l0.6,-4.94h5.26v1.36H4.1L3.72,7.02l0.08,0.03C4,6.87 4.25,6.73 4.55,6.62c0.3,-0.12 0.63,-0.18 1.01,-0.18c0.6,0 1.13,0.14 1.6,0.41C7.62,7.11 7.98,7.5 8.24,8c0.27,0.5 0.41,1.1 0.41,1.79c0,0.66 -0.14,1.26 -0.43,1.78c-0.28,0.51 -0.67,0.92 -1.18,1.22C6.55,13.08 5.97,13.22 5.3,13.22z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M14.51,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83C10.19,9.95 10,9.03 10,7.99c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6H17.6v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.85,13.07 15.24,13.22 14.51,13.22z"/>
+    android:width="14dp"
+    android:height="17dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M13.9,12.24l-0.22,0.27c-0.63,0.73 -1.55,1.1 -2.76,1.1c-1.08,0 -1.92,-0.36 -2.53,-1.07s-0.93,-1.72 -0.94,-3.02V7.56c0,-1.39 0.28,-2.44 0.84,-3.13s1.39,-1.04 2.51,-1.04c0.95,0 1.69,0.26 2.23,0.79s0.83,1.28 0.89,2.26h-1.25c-0.05,-0.62 -0.22,-1.1 -0.52,-1.45s-0.74,-0.52 -1.34,-0.52c-0.72,0 -1.24,0.23 -1.57,0.7S8.72,6.37 8.71,7.4v2.03c0,1 0.19,1.77 0.57,2.31c0.38,0.54 0.93,0.8 1.65,0.8c0.67,0 1.19,-0.16 1.54,-0.49l0.18,-0.17V9.59h-1.82V8.52h3.07V12.24z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M1.15,8.47l0.43,-4.96h4.33v1.17H2.6L2.37,7.39C2.78,7.1 3.22,6.96 3.69,6.96c0.77,0 1.38,0.3 1.83,0.9s0.66,1.41 0.66,2.43c0,1.03 -0.24,1.84 -0.72,2.43S4.32,13.6 3.48,13.6c-0.75,0 -1.36,-0.24 -1.83,-0.73s-0.74,-1.16 -0.81,-2.02h1.13c0.07,0.57 0.23,1 0.49,1.29c0.26,0.29 0.59,0.43 1.01,0.43c0.47,0 0.84,-0.2 1.1,-0.61c0.26,-0.41 0.4,-0.96 0.4,-1.65c0,-0.65 -0.14,-1.18 -0.43,-1.59S3.88,8.09 3.4,8.09c-0.4,0 -0.72,0.1 -0.96,0.31L2.11,8.73L1.15,8.47z"/>
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml
+deleted file mode 100644
+index 93fcad298c3f..000000000000
+--- a/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml
+++ /dev/null
+@@ -1,33 +0,0 @@
+-<!--
+-     Copyright (C) 2021 The Android Open Source Project
+-
+-     Licensed under the Apache License, Version 2.0 (the "License");
+-     you may not use this file except in compliance with the License.
+-     You may obtain a copy of the License at
+-
+-          http://www.apache.org/licenses/LICENSE-2.0
+-
+-     Unless required by applicable law or agreed to in writing, software
+-     distributed under the License is distributed on an "AS IS" BASIS,
+-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-     See the License for the specific language governing permissions and
+-     limitations under the License.
+--->
+-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="27dp"
+-        android:height="16dp"
+-        android:viewportWidth="27.0"
+-        android:viewportHeight="16.0">
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M5.3,13.22c-0.57,0 -1.1,-0.11 -1.58,-0.34c-0.48,-0.22 -0.87,-0.55 -1.18,-0.98C2.24,11.47 2.06,10.93 2,10.3l1.48,-0.2c0.07,0.5 0.25,0.92 0.56,1.25c0.32,0.32 0.74,0.48 1.26,0.48c0.57,0 1.02,-0.18 1.34,-0.55c0.33,-0.37 0.49,-0.87 0.49,-1.48c0,-0.61 -0.16,-1.09 -0.49,-1.46C6.32,7.96 5.88,7.78 5.32,7.78C5,7.78 4.7,7.85 4.42,8C4.15,8.14 3.93,8.33 3.76,8.56L2.28,7.92l0.6,-4.94h5.26v1.36H4.1L3.72,7.02l0.08,0.03C4,6.87 4.25,6.73 4.55,6.62c0.3,-0.12 0.63,-0.18 1.01,-0.18c0.6,0 1.13,0.14 1.6,0.41C7.62,7.11 7.98,7.5 8.24,8c0.27,0.5 0.41,1.1 0.41,1.79c0,0.66 -0.14,1.26 -0.43,1.78c-0.28,0.51 -0.67,0.92 -1.18,1.22C6.55,13.08 5.97,13.22 5.3,13.22z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M14.51,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83C10.19,9.95 10,9.03 10,7.99c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6H17.6v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.85,13.07 15.24,13.22 14.51,13.22z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M23,7.39c-0.53,0 -0.94,-0.16 -1.25,-0.47C21.45,6.6 21.3,6.16 21.3,5.6V3h0.8v2.66c0,0.3 0.08,0.54 0.23,0.71C22.48,6.54 22.7,6.62 23,6.62c0.3,0 0.52,-0.08 0.67,-0.25c0.15,-0.17 0.23,-0.41 0.23,-0.71V3h0.8v2.6c0,0.36 -0.07,0.67 -0.2,0.94s-0.33,0.48 -0.58,0.62C23.65,7.32 23.35,7.39 23,7.39z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M22.99,13.1c-0.39,0 -0.73,-0.09 -1.03,-0.28c-0.3,-0.19 -0.53,-0.45 -0.7,-0.79C21.08,11.7 21,11.3 21,10.85c0,-0.46 0.08,-0.85 0.25,-1.19c0.17,-0.34 0.41,-0.6 0.71,-0.78c0.3,-0.18 0.65,-0.28 1.04,-0.28c0.31,0 0.59,0.05 0.86,0.16c0.26,0.11 0.48,0.27 0.65,0.48c0.18,0.21 0.28,0.48 0.32,0.8l-0.83,0.14c-0.06,-0.26 -0.17,-0.46 -0.35,-0.6C23.49,9.44 23.27,9.37 23,9.37c-0.22,0 -0.42,0.06 -0.61,0.17c-0.18,0.11 -0.32,0.28 -0.43,0.5c-0.1,0.22 -0.16,0.49 -0.16,0.81c0,0.32 0.05,0.58 0.16,0.8s0.25,0.39 0.43,0.5c0.18,0.11 0.38,0.17 0.61,0.17c0.26,0 0.47,-0.07 0.65,-0.21c0.18,-0.14 0.3,-0.34 0.35,-0.59l0.85,0.09c-0.06,0.29 -0.17,0.54 -0.32,0.77c-0.15,0.22 -0.36,0.39 -0.61,0.52C23.66,13.03 23.35,13.1 22.99,13.1z"/>
+-</vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml
+deleted file mode 100644
+index ca47b6ff2edb..000000000000
+--- a/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml
+++ /dev/null
+@@ -1,33 +0,0 @@
+-<!--
+-     Copyright (C) 2021 The Android Open Source Project
+-
+-     Licensed under the Apache License, Version 2.0 (the "License");
+-     you may not use this file except in compliance with the License.
+-     You may obtain a copy of the License at
+-
+-          http://www.apache.org/licenses/LICENSE-2.0
+-
+-     Unless required by applicable law or agreed to in writing, software
+-     distributed under the License is distributed on an "AS IS" BASIS,
+-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-     See the License for the specific language governing permissions and
+-     limitations under the License.
+--->
+-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="27dp"
+-        android:height="16dp"
+-        android:viewportWidth="27.0"
+-        android:viewportHeight="16.0">
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M5.3,13.22c-0.57,0 -1.1,-0.11 -1.58,-0.34c-0.48,-0.22 -0.87,-0.55 -1.18,-0.98C2.24,11.47 2.06,10.93 2,10.3l1.48,-0.2c0.07,0.5 0.25,0.92 0.56,1.25c0.32,0.32 0.74,0.48 1.26,0.48c0.57,0 1.02,-0.18 1.34,-0.55c0.33,-0.37 0.49,-0.87 0.49,-1.48c0,-0.61 -0.16,-1.09 -0.49,-1.46C6.32,7.96 5.88,7.78 5.32,7.78C5,7.78 4.7,7.85 4.42,8C4.15,8.14 3.93,8.33 3.76,8.56L2.28,7.92l0.6,-4.94h5.26v1.36H4.1L3.72,7.02l0.08,0.03C4,6.87 4.25,6.73 4.55,6.62c0.3,-0.12 0.63,-0.18 1.01,-0.18c0.6,0 1.13,0.14 1.6,0.41C7.62,7.11 7.98,7.5 8.24,8c0.27,0.5 0.41,1.1 0.41,1.79c0,0.66 -0.14,1.26 -0.43,1.78c-0.28,0.51 -0.67,0.92 -1.18,1.22C6.55,13.08 5.97,13.22 5.3,13.22z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M14.51,13.22c-0.88,0 -1.66,-0.21 -2.34,-0.64c-0.67,-0.44 -1.2,-1.05 -1.6,-1.83C10.19,9.95 10,9.03 10,7.99c0,-1.05 0.21,-1.96 0.62,-2.74c0.41,-0.79 0.97,-1.4 1.67,-1.83c0.7,-0.44 1.5,-0.66 2.39,-0.66c1.09,0 2.01,0.25 2.74,0.76c0.75,0.5 1.22,1.21 1.41,2.11l-1.47,0.39c-0.17,-0.56 -0.48,-1 -0.94,-1.32c-0.45,-0.33 -1.03,-0.49 -1.75,-0.49c-0.57,0 -1.09,0.14 -1.57,0.43c-0.48,0.29 -0.85,0.71 -1.13,1.27s-0.42,1.25 -0.42,2.07c0,0.81 0.14,1.5 0.41,2.07c0.28,0.56 0.65,0.98 1.11,1.27c0.47,0.29 0.98,0.43 1.54,0.43c0.57,0 1.06,-0.11 1.47,-0.34c0.42,-0.23 0.75,-0.55 0.99,-0.94c0.25,-0.4 0.41,-0.85 0.46,-1.36h-2.88V7.79h4.37c0,0.87 0,1.74 0,2.6c0,0.87 0,1.74 0,2.6H17.6v-1.4h-0.08c-0.28,0.49 -0.67,0.88 -1.18,1.18C15.85,13.07 15.24,13.22 14.51,13.22z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M23,7.39c-0.53,0 -0.94,-0.16 -1.25,-0.47C21.45,6.6 21.3,6.16 21.3,5.6V3h0.8v2.66c0,0.3 0.08,0.54 0.23,0.71C22.48,6.54 22.7,6.62 23,6.62c0.3,0 0.52,-0.08 0.67,-0.25c0.15,-0.17 0.23,-0.41 0.23,-0.71V3h0.8v2.6c0,0.36 -0.07,0.67 -0.2,0.94s-0.33,0.48 -0.58,0.62C23.65,7.32 23.35,7.39 23,7.39z"/>
+-    <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M21.41,13L20.3,8.7h0.73l0.64,2.78l0.07,0.38h0.04l0.09,-0.38l0.81,-2.78h0.66l0.79,2.78l0.09,0.37h0.04l0.07,-0.37l0.65,-2.78h0.72L24.59,13H23.9l-0.78,-2.84l-0.1,-0.41h-0.04l-0.1,0.41L22.08,13H21.41z"/>
+-</vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml b/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml
+index 22bcf7b8c8a3..ed9d85e3cbe4 100644
+--- a/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml
+++ b/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml
+@@ -14,14 +14,17 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="24dp"
+-        android:height="16dp"
+-        android:viewportWidth="24.0"
+-        android:viewportHeight="16.0">
+        android:width="38dp"
+        android:height="24dp"
+        android:viewportWidth="38.0"
+        android:viewportHeight="24.0">
+     <path
+         android:fillColor="#FF000000"
+-        android:pathData="M4.59,13L2,2.98h1.69l1.5,6.48l0.17,0.88h0.08l0.21,-0.88l1.89,-6.48h1.54l1.83,6.48l0.21,0.87h0.08l0.15,-0.87l1.51,-6.48h1.68L12.01,13H10.4L8.58,6.36L8.36,5.4H8.27L8.05,6.36L6.16,13H4.59z"/>
+        android:pathData="M9.45,14.48h1.8c-0.05,0.98 -0.24,1.82 -0.6,2.53c-0.35,0.7 -0.85,1.24 -1.51,1.62c-0.66,0.38 -1.48,0.57 -2.47,0.57c-0.71,0 -1.35,-0.14 -1.92,-0.42c-0.57,-0.28 -1.06,-0.68 -1.47,-1.2c-0.4,-0.53 -0.71,-1.16 -0.93,-1.89c-0.21,-0.74 -0.32,-1.56 -0.32,-2.48v-2.63c0,-0.91 0.11,-1.74 0.32,-2.47c0.22,-0.74 0.54,-1.36 0.95,-1.88C3.71,5.69 4.21,5.29 4.8,5.01c0.6,-0.28 1.28,-0.42 2.03,-0.42c0.92,0 1.71,0.19 2.34,0.56c0.64,0.36 1.14,0.9 1.48,1.61c0.35,0.7 0.55,1.57 0.59,2.59h-1.8C9.41,8.59 9.29,7.98 9.1,7.52C8.91,7.04 8.63,6.69 8.26,6.47C7.9,6.24 7.42,6.13 6.84,6.13c-0.52,0 -0.97,0.1 -1.36,0.31C5.1,6.65 4.79,6.95 4.54,7.34C4.3,7.72 4.12,8.19 3.99,8.74c-0.12,0.54 -0.18,1.15 -0.18,1.82v2.65c0,0.62 0.05,1.21 0.15,1.75c0.1,0.54 0.27,1.02 0.49,1.43c0.23,0.4 0.52,0.72 0.89,0.95c0.36,0.23 0.81,0.34 1.33,0.34c0.66,0 1.18,-0.11 1.56,-0.32c0.38,-0.21 0.67,-0.56 0.85,-1.03C9.27,15.85 9.39,15.23 9.45,14.48z"/>
+     <path
+         android:fillColor="#FF000000"
+-        android:pathData="M15.77,9.85V8.56h2.46V6.1h1.3v2.46H22v1.29h-2.46v2.46h-1.3V9.85H15.77z"/>
+        android:pathData="M24.87,4.78l-1.74,9.72l-0.2,1.64l-0.29,-1.44l-2.21,-9.92l-0.2,0l-1.06,0l-0.22,0l-2.28,9.92l-0.28,1.4l-0.18,-1.59l-1.78,-9.73l-1.79,0l2.83,14.22l0.34,0l0.92,0l0.35,0l2.48,-10.36l0.14,-0.84l0.15,0.84l2.36,10.36l0.36,0l0.92,0l0.34,0l2.82,-14.22z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M35.72,6.32l0,-1.54l-5.61,0l-0.34,0l-1.45,0l0,14.22l1.79,0l0,-6.28l4.8,0l0,-1.54l-4.8,0l0,-4.86z"/>
+ </vector>
+diff --git a/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml
+index 739e29d886c2..e6b4fb698242 100644
+--- a/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml
+++ b/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml
+@@ -14,17 +14,20 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="26dp"
+-        android:height="16dp"
+-        android:viewportWidth="26.0"
+-        android:viewportHeight="16.0">
+    android:width="15.88dp"
+    android:height="15dp"
+    android:viewportWidth="18"
+    android:viewportHeight="17">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.34,12.4h3.9v1.07H0.08V3.52h1.26V12.4z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M2,13V2.98h1.53v8.57H8.3V13H2z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.1,4.6H8.48v8.88H7.23V4.6H4.62V3.52h6.48V4.6z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M11.24,13V4.43H8.19V2.98h7.63v1.46h-3.05V13H11.24z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17.34,8.88h-3.52v3.53h4.1v1.07h-5.35V3.52h5.28V4.6h-4.03V7.8h3.52V8.88z" />
+     <path
+-        android:fillColor="#FF000000"
+-        android:pathData="M17.41,13V2.98h6.36v1.46h-4.83v2.65h4.4v1.46h-4.4v3.01h4.83V13H17.41z"/>
+        android:pathData="M 0 0 H 18 V 17 H 0 V 0 Z" />
+ </vector>
+diff --git a/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml b/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml
+index 48faeb22416f..1511659ea42f 100644
+--- a/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml
+@@ -14,11 +14,11 @@
+      limitations under the License.
+ -->
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
+-        android:width="16dp"
+-        android:height="16dp"
+-        android:viewportWidth="16.0"
+-        android:viewportHeight="16.0">
+        android:width="@dimen/signal_icon_size"
+        android:height="@dimen/signal_icon_size"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+     <path
+         android:fillColor="#FF000000"
+-        android:pathData="M4.5,13.02V3h3.93c0.97,0 1.75,0.27 2.34,0.81c0.6,0.53 0.9,1.28 0.9,2.25c0,0.63 -0.19,1.2 -0.56,1.74c-0.37,0.53 -0.95,0.91 -1.74,1.12l2.45,4.02v0.08h-1.69L7.75,9.09H6.03v3.93H4.5zM8.46,4.44H6.03v3.23h2.44c0.49,0 0.9,-0.14 1.2,-0.41c0.31,-0.28 0.46,-0.69 0.46,-1.22s-0.15,-0.93 -0.45,-1.2C9.38,4.58 8.98,4.44 8.46,4.44z"/>
+        android:pathData="M14.21,12.81c0.36,-0.16 0.69,-0.36 0.97,-0.61c0.41,-0.38 0.72,-0.83 0.94,-1.37c0.21,-0.54 0.32,-1.14 0.32,-1.79c0,-0.92 -0.16,-1.7 -0.49,-2.33c-0.32,-0.64 -0.79,-1.12 -1.43,-1.45c-0.62,-0.33 -1.4,-0.49 -2.32,-0.49H8.23V19h1.8v-5.76h2.5L15.06,19h1.92v-0.12L14.21,12.81zM10.03,11.71V6.32h2.18c0.59,0 1.06,0.11 1.42,0.34c0.36,0.22 0.62,0.54 0.78,0.95c0.16,0.41 0.24,0.89 0.24,1.44c0,0.49 -0.09,0.93 -0.27,1.34c-0.18,0.4 -0.46,0.73 -0.82,0.97c-0.36,0.23 -0.82,0.35 -1.37,0.35H10.03z"/>
+ </vector>
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
+++ b/patches_platform_personal/frameworks_base/0014-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch
@ -0,0 +1,29 @@
+From 9c0179a912ebe9de6bf3b142c709306467a84fe3 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 29 Sep 2022 11:27:57 +0000
+Subject: [PATCH 14/21] Revert "Use the default top clock margin on h800
+ devices"
+
+This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd
+and 2a254b4d479029aec46f79a0ed14ffab6d0424bc.
+---
+ packages/SystemUI/res/values-h800dp/dimens.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/packages/SystemUI/res/values-h800dp/dimens.xml b/packages/SystemUI/res/values-h800dp/dimens.xml
+index 94fe20955ce6..1d6f279afc66 100644
+--- a/packages/SystemUI/res/values-h800dp/dimens.xml
+++ b/packages/SystemUI/res/values-h800dp/dimens.xml
+@@ -15,6 +15,9 @@
+   -->
+ 
+ <resources>
+    <!-- Minimum margin between clock and top of screen or ambient indication -->
+    <dimen name="keyguard_clock_top_margin">38dp</dimen>
+
+     <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->
+     <dimen name="large_clock_text_size">200dp</dimen>
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
+++ b/patches_platform_personal/frameworks_base/0015-UI-Always-render-windows-into-cutouts.patch
@ -0,0 +1,59 @@
+From 10a44b558f67f6a1622bcef5d0bffa0d95c08cd1 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 15/21] UI: Always render windows into cutouts
+
+Eliminates black/white letterboxing
+Quick and dirty way to do the latter - wait for proper fix from Google
+
+Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3
+---
+ .../com/android/server/wm/DisplayFrames.java  | 19 ++++---------------
+ .../com/android/server/wm/DisplayPolicy.java  |  1 +
+ 2 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java
+index fd0631320520..97989e086c74 100644
+--- a/services/core/java/com/android/server/wm/DisplayFrames.java
+++ b/services/core/java/com/android/server/wm/DisplayFrames.java
+@@ -99,21 +99,10 @@ public class DisplayFrames {
+         state.setRoundedCorners(roundedCorners);
+         state.setPrivacyIndicatorBounds(indicatorBounds);
+         state.getDisplayCutoutSafe(safe);
+-        if (!cutout.isEmpty()) {
+-            state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame(
+-                    unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom);
+-            state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame(
+-                    unrestricted.left, unrestricted.top, unrestricted.right, safe.top);
+-            state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame(
+-                    safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom);
+-            state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame(
+-                    unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom);
+-        } else {
+-            state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
+-            state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
+-            state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
+-            state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);
+-        }
+        state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);
+        state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);
+        state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);
+        state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);
+         return true;
+     }
+ 
+diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
+index 7e91989a9105..a42f8c12c792 100644
+--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
+@@ -1558,6 +1558,7 @@ public class DisplayPolicy {
+         displayFrames = win.getDisplayFrames(displayFrames);
+ 
+         final WindowManager.LayoutParams attrs = win.getLayoutingAttrs(displayFrames.mRotation);
+        attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+         final Rect attachedWindowFrame = attached != null ? attached.getFrame() : null;
+ 
+         // If this window has different LayoutParams for rotations, we cannot trust its requested
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
+++ b/patches_platform_personal/frameworks_base/0016-UI-Kill-rounded-corners-in-notification-scrim.patch
@ -0,0 +1,28 @@
+From 36246a955810a443896bab2a0c41c7f4957236c7 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 16/21] UI: Kill rounded corners in notification scrim
+
+Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place
+
+Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
+---
+ packages/SystemUI/res/values/dimens.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index 6e8130c9d7ab..2d29bc140471 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -626,7 +626,7 @@
+     <!-- Burmese line spacing multiplier between hours and minutes of the keyguard clock -->
+     <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>
+ 
+-    <dimen name="notification_scrim_corner_radius">32dp</dimen>
+    <dimen name="notification_scrim_corner_radius">0dp</dimen>
+ 
+     <!-- The minimum amount the user needs to swipe to go to the camera / phone. -->
+     <dimen name="keyguard_min_swipe_amount">110dp</dimen>
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
+++ b/patches_platform_personal/frameworks_base/0017-UI-Reconfigure-power-menu-items.patch
@ -0,0 +1,32 @@
+From 378b7c68117b48b12fcc19881d8231169e16bcf8 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 17/21] UI: Reconfigure power menu items
+
+Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
+---
+ core/res/res/values/config.xml | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
+index 5494b3e2a7ab..11173caffe07 100644
+--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
+@@ -3175,13 +3175,10 @@
+          "logout" =  Logout the current user
+          -->
+     <string-array translatable="false" name="config_globalActionsList">
+-        <item>emergency</item>
+-        <item>lockdown</item>
+         <item>power</item>
+         <item>restart</item>
+-        <item>logout</item>
+         <item>screenshot</item>
+-        <item>bugreport</item>
+        <item>airplane</item>
+     </string-array>
+ 
+     <!-- Number of milliseconds to hold a wake lock to ensure that drawing is fully
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
+++ b/patches_platform_personal/frameworks_base/0018-UI-Reconfigure-quick-settings-tiles.patch
@ -0,0 +1,26 @@
+From 35140ec786d0e01356a998fed0c6ff27692a0cbd 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 18/21] UI: Reconfigure quick settings tiles
+
+Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
+---
+ packages/SystemUI/res/values/config.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
+index c4625e7e784d..2713099f3d57 100644
+--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
+@@ -74,7 +74,7 @@
+ 
+     <!-- The default tiles to display in QuickSettings -->
+     <string name="quick_settings_tiles_default" translatable="false">
+-        internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle
+        wifi,cell,hotspot,location,rotation,flashlight
+     </string>
+ 
+     <!-- The class path of the Safety Quick Settings Tile -->
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
+++ b/patches_platform_personal/frameworks_base/0019-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
@ -0,0 +1,28 @@
+From ac9f68202633ba7bcc1f43588cbf3247eb165eb8 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 19/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+
+I decide what's good enough for a wallpaper!
+
+Change-Id: I5ccd85b3df12e53746a4ac6cbc37ba8d11f6c336
+---
+ core/java/android/app/WallpaperColors.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
+index 067a4c3c047e..a8d3c14e1d9d 100644
+--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
+@@ -577,7 +577,7 @@ public final class WallpaperColors implements Parcelable {
+ 
+         int hints = 0;
+         double meanLuminance = totalLuminance / pixels.length;
+-        if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE && darkPixels < maxDarkPixels) {
+        if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE) {
+             hints |= HINT_SUPPORTS_DARK_TEXT;
+         }
+         if (meanLuminance < DARK_THEME_MEAN_LUMINANCE) {
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
+++ b/patches_platform_personal/frameworks_base/0020-UI-Remove-privacy-dot-padding.patch
@ -0,0 +1,26 @@
+From d0c1675a0e1023aaf70e5141e55ad8b00bf23203 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 20/21] UI: Remove privacy dot padding
+
+Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
+---
+ packages/SystemUI/res/values/dimens.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
+index 2d29bc140471..6559c303d18a 100644
+--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
+@@ -960,7 +960,7 @@
+     <dimen name="ongoing_appops_chip_animation_in_status_bar_translation_x">15dp</dimen>
+     <dimen name="ongoing_appops_chip_animation_out_status_bar_translation_x">7dp</dimen>
+     <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+-    <dimen name="ongoing_appops_dot_min_padding">20dp</dimen>
+    <dimen name="ongoing_appops_dot_min_padding">0dp</dimen>
+ 
+     <dimen name="ongoing_appops_dialog_side_margins">@dimen/notification_shade_content_margin_horizontal</dimen>
+ 
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
+++ b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch
@ -0,0 +1,47 @@
+From cf087dc089a51f769b7d073c04434033301ab899 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Fri, 30 Sep 2022 16:02:16 +0000
+Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints
+
+Y U no test for consistency, Google?
+
+Change-Id: Ie5663bdf518b4ef93d6deb634e707a32d052ac55
+---
+ core/java/android/app/WallpaperColors.java | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
+index a8d3c14e1d9d..88609f3d7052 100644
+--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
+@@ -552,15 +552,15 @@ public final class WallpaperColors implements Parcelable {
+         float[] tmpHsl = new float[3];
+         for (int i = 0; i < pixels.length; i++) {
+             int pixelColor = pixels[i];
+-            ColorUtils.colorToHSL(pixelColor, tmpHsl);
+             final int alpha = Color.alpha(pixelColor);
+ 
+             // Apply composite colors where the foreground is a black layer with an alpha value of
+             // the dim amount and the background is the wallpaper pixel color.
+             int compositeColors = ColorUtils.compositeColors(blackTransparent, pixelColor);
+ 
+-            // Calculate the adjusted luminance of the dimmed wallpaper pixel color.
+-            double adjustedLuminance = ColorUtils.calculateLuminance(compositeColors);
+            // Calculate the luminance of the dimmed wallpaper pixel color.
+            ColorUtils.colorToHSL(compositeColors, tmpHsl);
+            double luminance = tmpHsl[2];
+ 
+             // Make sure we don't have a dark pixel mass that will
+             // make text illegible.
+@@ -572,7 +572,7 @@ public final class WallpaperColors implements Parcelable {
+                     pixels[i] = Color.RED;
+                 }
+             }
+-            totalLuminance += adjustedLuminance;
+            totalLuminance += luminance;
+         }
+ 
+         int hints = 0;
+-- 
+2.25.1
+
--- a/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch
+++ b/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch
@ -0,0 +1,62 @@
+From f6baebedc09b503e477f7f4f1d83ac494d5028d3 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 8 Jun 2021 12:00:26 +0000
+Subject: [PATCH] Telephony: Disable SPN retrieval
+
+Kills "double carrier name" on lock screen
+Not ideal, but not worth wasting more time on
+
+Change-Id: I06dd17989194590972e526de85dbacf74eff805e
+---
+ .../internal/telephony/uicc/IccRecords.java   | 25 +++++--------------
+ 1 file changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java
+index b33e899b9..220ed875d 100644
+--- a/src/java/com/android/internal/telephony/uicc/IccRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java
+@@ -717,35 +717,22 @@ public abstract class IccRecords extends Handler implements IccConstants {
+     }
+ 
+     /**
+-     * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41).
+     * Return null, disabling Service Provider Name.
+      *
+-     * @return null if SIM is not yet ready or no RUIM entry
+     * @return null
+      */
+     public String getServiceProviderName() {
+-        if (mCarrierTestOverride.isInTestMode()) {
+-            String fakeSpn = mCarrierTestOverride.getFakeSpn();
+-            if (fakeSpn != null) {
+-                return fakeSpn;
+-            }
+-        }
+-        return mSpn;
+        return null;
+     }
+ 
+     /**
+-     * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41) or
+-     * the brand override. The brand override has higher priority than the SPN from SIM.
+     * Return null, disabling Service Provider Name.
+      *
+-     * @return service provider name.
+     * @return null
+      */
+     @Nullable
+     public String getServiceProviderNameWithBrandOverride() {
+-        if (mParentApp != null && mParentApp.getUiccProfile() != null) {
+-            String brandOverride = mParentApp.getUiccProfile().getOperatorBrandOverride();
+-            if (!TextUtils.isEmpty(brandOverride)) {
+-                return brandOverride;
+-            }
+-        }
+-        return mSpn;
+        return null;
+     }
+ 
+     protected void setServiceProviderName(String spn) {
+-- 
+2.25.1
+
--- a/patches_platform_personal/lineage-sdk/0001-sdk-Do-not-warn-about-SELinux-and-build-signature-st.patch
+++ b/patches_platform_personal/lineage-sdk/0001-sdk-Do-not-warn-about-SELinux-and-build-signature-st.patch
@ -0,0 +1,33 @@
+From 8a3d38d3148713836c12d85f7fc4a6a366cc00e4 Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Mon, 4 Mar 2019 14:27:56 +0800
+Subject: [PATCH] sdk: Do not warn about SELinux and build signature status
+
+Change-Id: I6e1ca9f2c2f7763364a9a370f444dfe8059d0563
+---
+ .../org/lineageos/platform/internal/TrustInterfaceService.java   | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+index 2dcb938..e9f2dca 100644
+--- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java
+@@ -197,15 +197,6 @@ public class TrustInterfaceService extends LineageSystemService {
+     }
+ 
+     private void runTestInternal() {
+-        int selinuxStatus = getSELinuxStatus();
+-        if (selinuxStatus != TrustInterface.TRUST_FEATURE_LEVEL_GOOD) {
+-            postNotificationForFeatureInternal(TrustInterface.TRUST_WARN_SELINUX);
+-        }
+-
+-        int keysStatus = getKeysStatus();
+-        if (keysStatus != TrustInterface.TRUST_FEATURE_LEVEL_GOOD) {
+-            postNotificationForFeatureInternal(TrustInterface.TRUST_WARN_PUBLIC_KEY);
+-        }
+     }
+ 
+     /* Utils */
+-- 
+2.7.4
+
--- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
+++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch
@ -0,0 +1,61 @@
+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
+
+Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
+---
+ res/xml/screensaver_settings.xml                   | 8 +-------
+ src/com/android/deskclock/Screensaver.java         | 5 ++---
+ src/com/android/deskclock/ScreensaverActivity.java | 2 +-
+ 3 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml
+index 1680aab83..73375dcfa 100644
+--- a/res/xml/screensaver_settings.xml
+++ b/res/xml/screensaver_settings.xml
+@@ -24,10 +24,4 @@
+         android:key="screensaver_clock_style"
+         android:title="@string/clock_style" />
+ 
+-    <CheckBoxPreference
+-        android:defaultValue="true"
+-        android:key="screensaver_night_mode"
+-        android:summary="@string/night_mode_summary"
+-        android:title="@string/night_mode_title" />
+-
+-</PreferenceScreen>
+\ No newline at end of file
+</PreferenceScreen>
+diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
+index 29cc13ff9..8def22b30 100644
+--- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java
+@@ -141,9 +141,8 @@ public final class Screensaver extends DreamService {
+ 
+     private void setClockStyle() {
+         Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock);
+-        final boolean dimNightMode = DataModel.getDataModel().getScreensaverNightModeOn();
+-        Utils.dimClockView(dimNightMode, mMainClockView);
+-        setScreenBright(!dimNightMode);
+        Utils.dimClockView(false, mMainClockView);
+        setScreenBright(true);
+     }
+ 
+     /**
+diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
+index cf770086b..7a756df7d 100644
+--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
+@@ -107,7 +107,7 @@ public class ScreensaverActivity extends BaseActivity {
+         Utils.setClockIconTypeface(mMainClockView);
+         Utils.setTimeFormat((TextClock) digitalClock, false);
+         Utils.setClockStyle(digitalClock, analogClock);
+-        Utils.dimClockView(true, mMainClockView);
+        Utils.dimClockView(false, mMainClockView);
+         analogClock.enableSeconds(false);
+ 
+         mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_apps_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
@ -0,0 +1,587 @@
+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
+
+Lollipop is so yesterday...
+Bring the layouts of various digital clocks (app, widget, daydream)
+in-line, and adjust their styles to match the custom keyguard on S
+
+Caveats/TODO:
+- Widget swallows all touch events, even when touching an empty area
+- World clocks in widgets are left untouched
+
+Change-Id: I10c6fa213c89ac2f6e342be13fdd6390f7f787b0
+---
+ res/layout-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               | 23 +++---
+ res/values/dimens.xml                         | 12 ++-
+ res/values/styles.xml                         | 19 +++++
+ .../alarmclock/DigitalAppWidgetProvider.java  | 31 ++++----
+ src/com/android/deskclock/AlarmUtils.java     |  2 +-
+ 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 6abfdddd6..8ad98c0cf 100644
+--- a/res/layout-land/main_clock_frame.xml
+++ b/res/layout-land/main_clock_frame.xml
+@@ -21,10 +21,11 @@
+     android:gravity="center_horizontal"
+     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">
+ 
+         <com.android.deskclock.AnalogClock
+             android:id="@+id/analog_clock"
+@@ -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:ellipsize="none"
+-            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"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal"/>
+    </LinearLayout>
+ 
+ </LinearLayout>
+diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
+index 23df1cd3b..b29ffedcf 100644
+--- a/res/layout/date_and_next_alarm_time.xml
+++ b/res/layout/date_and_next_alarm_time.xml
+@@ -18,36 +18,41 @@
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     xmlns:tools="http://schemas.android.com/tools"
+-    android:layout_gravity="center_vertical"
+-    android:gravity="center">
+    android:gravity="center_vertical|start"
+    android:orientation="vertical">
+ 
+     <TextView
+         android:id="@+id/date"
+-        style="@style/body"
+        style="@style/sc_keyguard_row"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:textAllCaps="true"
+        android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+        android:paddingStart="@dimen/sc_keyguard_row_date_start_padding"
+         tools:text="Sa., 01.01."/>
+ 
+-    <TextView
+-        android:id="@+id/nextAlarmIcon"
+-        style="@style/body"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center"
+-        android:layout_marginEnd="@dimen/alarm_icon_padding"
+-        android:layout_marginStart="@dimen/alarm_icon_padding"
+-        android:ellipsize="none"
+-        android:includeFontPadding="false"
+-        android:maxLines="1"
+-        android:text="@string/clock_emoji" />
+-
+-    <TextView
+-        android:id="@+id/nextAlarm"
+-        style="@style/body"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:textAllCaps="true"
+-        tools:text="Mo., 07:00"/>
+-
+-</LinearLayout>
+\ No newline at end of file
+    <LinearLayout
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+         android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+        <TextView
+            android:id="@+id/nextAlarmIcon"
+            style="@style/sc_keyguard_row"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginEnd="@dimen/alarm_icon_padding"
+            android:text="@string/clock_emoji"
+            android:textSize="@dimen/sc_keyguard_alarm_icon_size" />
+
+        <TextView
+            android:id="@+id/nextAlarm"
+            style="@style/sc_keyguard_row"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Mo., 07:00"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
+index dafabfddf..d24219dbb 100644
+--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
+@@ -42,19 +42,13 @@
+ 
+         <TextClock
+             android:id="@+id/digital_clock"
+-            style="@style/big_thin"
+            style="@style/sc_keyguard_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:layout_marginBottom="@dimen/bottom_text_spacing_digital"
+-            android:ellipsize="none"
+-            android:gravity="center"
+-            android:singleLine="true"
+-            android:textColor="@color/white"
+-            android:textSize="@dimen/main_clock_font_size" />
+            android:fontFamily="sans-serif-thin" />
+ 
+         <include layout="@layout/date_and_next_alarm_time" />
+ 
+     </LinearLayout>
+ 
+-</FrameLayout>
+\ No newline at end of file
+</FrameLayout>
+diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
+index c5b4837a6..e376a5a7a 100644
+--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
+@@ -19,58 +19,53 @@
+     android:id="@+id/digital_widget"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent"
+-    android:gravity="top|center_horizontal"
+    android:gravity="center"
+     android:orientation="vertical">
+ 
+-    <TextClock
+-        android:id="@+id/clock"
+-        style="@style/widget_big_thin"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top"
+-        android:ellipsize="none"
+-        android:format12Hour="@string/lock_screen_12_hour_format"
+-        android:format24Hour="@string/lock_screen_24_hour_format"
+-        android:includeFontPadding="false"
+-        android:singleLine="true"
+-        android:textColor="@color/white" />
+-
+     <LinearLayout
+        android:id="@+id/digital_widget_actual"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top">
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+ 
+         <TextClock
+-            android:id="@+id/date"
+-            style="@style/widget_label"
+            android:id="@+id/clock"
+            style="@style/sc_keyguard_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:ellipsize="none"
+-            android:includeFontPadding="false"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:format12Hour="@string/lock_screen_12_hour_format"
+            android:format24Hour="@string/lock_screen_24_hour_format" />
+ 
+-        <ImageView
+-            android:id="@+id/nextAlarmIcon"
+        <TextClock
+            android:id="@+id/date"
+            style="@style/sc_keyguard_row"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:contentDescription="@null"
+-            android:scaleType="center" />
+            android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
+ 
+-        <TextView
+-            android:id="@+id/nextAlarm"
+-            style="@style/widget_label"
+        <LinearLayout
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:ellipsize="none"
+-            android:includeFontPadding="false"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+            <ImageView
+                android:id="@+id/nextAlarmIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:contentDescription="@null"
+                android:scaleType="center" />
+
+            <TextView
+                android:id="@+id/nextAlarm"
+                style="@style/sc_keyguard_row"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+ 
+     </LinearLayout>
+ 
+@@ -82,4 +77,4 @@
+         android:layout_marginTop="20dp"
+         android:divider="@null" />
+ 
+-</LinearLayout>
+\ No newline at end of file
+</LinearLayout>
+diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
+index f524cf536..b9a28c79f 100644
+--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
+@@ -15,64 +15,55 @@
+ -->
+ <LinearLayout
+     xmlns:android="http://schemas.android.com/apk/res/android"
+-    android:layout_width="wrap_content"
+-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+     android:orientation="vertical">
+ 
+-    <TextClock
+-        android:id="@+id/clock"
+-        style="@style/widget_big_thin"
+-        android:layout_width="wrap_content"
+-        android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top"
+-        android:includeFontPadding="false"
+-        android:ellipsize="none"
+-        android:format12Hour="@string/lock_screen_12_hour_format"
+-        android:format24Hour="@string/lock_screen_24_hour_format"
+-        android:singleLine="true"
+-        android:textColor="@color/white" />
+-
+     <LinearLayout
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+-        android:layout_gravity="center_horizontal|top">
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+ 
+         <TextClock
+-            android:id="@+id/date"
+-            style="@style/widget_label"
+            android:id="@+id/clock"
+            style="@style/sc_keyguard_clock"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:includeFontPadding="false"
+-            android:ellipsize="none"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:format12Hour="@string/lock_screen_12_hour_format"
+            android:format24Hour="@string/lock_screen_24_hour_format" />
+ 
+-        <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
+-        <TextView
+-            android:id="@+id/nextAlarmIcon"
+-            style="@style/widget_label"
+        <TextClock
+            android:id="@+id/date"
+            style="@style/sc_keyguard_row"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:includeFontPadding="false"
+-            android:ellipsize="none"
+-            android:singleLine="true"
+-            android:text="@string/clock_emoji"
+-            android:textColor="@color/white" />
+            android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
+ 
+-        <TextView
+-            android:id="@+id/nextAlarm"
+-            style="@style/widget_label"
+        <LinearLayout
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+-            android:layout_gravity="center"
+-            android:includeFontPadding="false"
+-            android:ellipsize="none"
+-            android:singleLine="true"
+-            android:textAllCaps="true"
+-            android:textColor="@color/white" />
+            android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+            android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+            <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
+            <TextView
+                android:id="@+id/nextAlarmIcon"
+                style="@style/sc_keyguard_row"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/clock_emoji" />
+
+            <TextView
+                android:id="@+id/nextAlarm"
+                style="@style/sc_keyguard_row"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+ 
+     </LinearLayout>
+ 
+diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
+index 159956f19..d0701eaf0 100644
+--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
+@@ -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_gravity="start">
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+ 
+         <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"
+-            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" />
+
+    </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 856ef8241..3061e27f6 100644
+--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
+@@ -61,7 +61,7 @@
+     <dimen name="body_font_padding">4dp</dimen>
+ 
+     <dimen name="alarm_label_size">14sp</dimen>
+-    <dimen name="alarm_icon_padding">6dp</dimen>
+    <dimen name="alarm_icon_padding">7dp</dimen>
+ 
+     <dimen name="backspace_icon_size">24dp</dimen>
+     <dimen name="no_alarms_size">90dp</dimen>
+@@ -140,4 +140,14 @@
+     <dimen name="alarm_clock_expanded_vertical_margin">8dp</dimen>
+ 
+     <dimen name="settings_padding">4dp</dimen>
+
+    <!-- Keyguard dimens, taken from S fwb -->
+    <dimen name="sc_keyguard_clock_text_size">86dp</dimen>
+    <dimen name="sc_keyguard_row_text_size">16dp</dimen>
+    <dimen name="sc_keyguard_alarm_icon_size">21dp</dimen>
+    <!-- Padding correction values, measured from S fwb -->
+    <dimen name="sc_keyguard_status_area_top_padding">9dp</dimen>
+    <dimen name="sc_keyguard_row_top_padding">11dp</dimen>
+    <dimen name="sc_keyguard_row_date_start_padding">6dp</dimen>
+    <dimen name="sc_keyguard_row_alarm_start_padding">5.5dp</dimen>
+ </resources>
+diff --git a/res/values/styles.xml b/res/values/styles.xml
+index 7ae54c97c..73a800383 100644
+--- a/res/values/styles.xml
+++ b/res/values/styles.xml
+@@ -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>
+        <item name="android:textSize">@dimen/sc_keyguard_clock_text_size</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="sc_keyguard_row">
+        <item name="android:textSize">@dimen/sc_keyguard_row_text_size</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:ellipsize">none</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+ </resources>
+diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+index e31f2d801..a93766697 100644
+--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+@@ -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, FLAG_IMMUTABLE);
+-            rv.setOnClickPendingIntent(R.id.digital_widget, pi);
+            rv.setOnClickPendingIntent(R.id.digital_widget_actual, pi);
+         }
+ 
+         // Configure child views of the remote view.
+@@ -244,7 +244,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         final int targetWidthPx = portrait ? minWidthPx : maxWidthPx;
+         final int targetHeightPx = portrait ? maxHeightPx : minHeightPx;
+         final int largestClockFontSizePx =
+-                resources.getDimensionPixelSize(R.dimen.widget_max_clock_font_size);
+                resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size);
+ 
+         // Create a size template that describes the widget bounds.
+         final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx);
+@@ -316,13 +316,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         }
+ 
+         // Measure the widget at the largest possible size.
+-        Sizes high = measure(template, template.getLargestClockFontSizePx(), sizer);
+        Sizes high = measure(context, template, template.getLargestClockFontSizePx(), sizer);
+         if (!high.hasViolations()) {
+             return high;
+         }
+ 
+         // Measure the widget at the smallest possible size.
+-        Sizes low = measure(template, template.getSmallestClockFontSizePx(), sizer);
+        Sizes low = measure(context, template, template.getSmallestClockFontSizePx(), sizer);
+         if (low.hasViolations()) {
+             return low;
+         }
+@@ -334,7 +334,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+                 return low;
+             }
+ 
+-            final Sizes midSize = measure(template, midFontSize, sizer);
+            final Sizes midSize = measure(context, template, midFontSize, sizer);
+             if (midSize.hasViolations()) {
+                 high = midSize;
+             } else {
+@@ -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.
+      */
+-    private static Sizes measure(Sizes template, int clockFontSize, View sizer) {
+    private static Sizes measure(Context context, Sizes template, int clockFontSize, View sizer) {
+         // Create a copy of the given template sizes.
+         final Sizes measuredSizes = template.newSize();
+ 
+@@ -408,13 +408,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         final TextView nextAlarmIcon = (TextView) sizer.findViewById(R.id.nextAlarmIcon);
+ 
+         // Adjust the font sizes.
+-        measuredSizes.setClockFontSizePx(clockFontSize);
+        measuredSizes.setClockFontSizePx(context, clockFontSize);
+         clock.setText(getLongestTimeString(clock));
+         clock.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mClockFontSizePx);
+         date.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
+         nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
+         nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
+-        nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0);
+        nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
+ 
+         // Measure and layout the sizer.
+         final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
+@@ -495,12 +495,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; }
+         private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; }
+         private int getClockFontSizePx() { return mClockFontSizePx; }
+-        private void setClockFontSizePx(int clockFontSizePx) {
+        private void setClockFontSizePx(Context context, int clockFontSizePx) {
+            final Resources resources = context.getResources();
+            int keyguardClockTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size);
+            int keyguardRowTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_row_text_size);
+            int keyguardAlarmIconSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_alarm_icon_size);
+            int alarmIconPaddingPx = resources.getDimensionPixelSize(R.dimen.alarm_icon_padding);
+             mClockFontSizePx = clockFontSizePx;
+-            mFontSizePx = max(1, round(clockFontSizePx / 7.5f));
+-            mIconFontSizePx = (int) (mFontSizePx * 1.4f);
+-            mIconPaddingPx = mFontSizePx / 3;
+-        }
+            mFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardRowTextSizePx));
+            mIconFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardAlarmIconSizePx));
+            mIconPaddingPx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) alarmIconPaddingPx));
+         }
+ 
+         /**
+          * @return the amount of widget height available to the world cities list
+diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java
+index db60ace95..43767d313 100644
+--- a/src/com/android/deskclock/AlarmUtils.java
+++ b/src/com/android/deskclock/AlarmUtils.java
+@@ -37,7 +37,7 @@ import java.util.Locale;
+ public class AlarmUtils {
+ 
+     public static String getFormattedTime(Context context, Calendar time) {
+-        final String skeleton = DateFormat.is24HourFormat(context) ? "EHm" : "Ehma";
+        final String skeleton = DateFormat.is24HourFormat(context) ? "Hm" : "hma";
+         final String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
+         return (String) DateFormat.format(pattern, time);
+     }
+-- 
+2.25.1
+
--- 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
@ -0,0 +1,118 @@
+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
+ clock widget
+
+RemoteViews is such a restrictive PITA
+
+Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3
+---
+ .../alarmclock/DigitalAppWidgetProvider.java  | 57 +++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+index 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;
+ import android.annotation.SuppressLint;
+ import android.app.AlarmManager;
+ import android.app.PendingIntent;
+import android.app.WallpaperColors;
+import android.app.WallpaperManager;
+ import android.appwidget.AppWidgetManager;
+ import android.appwidget.AppWidgetProvider;
+ import android.content.ComponentName;
+@@ -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);
+ 
+    private static WallpaperManager mWallpaperManager;
+    private static boolean mDarkText;
+
+    private static void relayoutAllWidgets(Context context) {
+        final AppWidgetManager wm = AppWidgetManager.getInstance(context);
+        final ComponentName provider = new ComponentName(context, DigitalAppWidgetProvider.class);
+        final int[] widgetIds = wm.getAppWidgetIds(provider);
+        for (int widgetId : widgetIds) {
+            relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId));
+        }
+    }
+
+    private static void addOnColorsChangedListener(Context context) {
+        mWallpaperManager.addOnColorsChangedListener(new WallpaperManager.OnColorsChangedListener() {
+            @Override
+            public void onColorsChanged(WallpaperColors colors, int which) {
+                relayoutAllWidgets(context);
+            }
+        }, null);
+    }
+
+     @Override
+     public void onEnabled(Context context) {
+         super.onEnabled(context);
+ 
+         // Schedule the day-change callback if necessary.
+         updateDayChangeCallback(context);
+
+        // Listen for wallpaper color changes
+        mWallpaperManager = WallpaperManager.getInstance(context);
+        addOnColorsChangedListener(context);
+
+        // Force a relayout to pick up initial colors
+        relayoutAllWidgets(context);
+     }
+ 
+     @Override
+@@ -204,6 +234,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+      */
+     private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId,
+             Bundle options, boolean portrait) {
+        // Determine text colors.
+        if (mWallpaperManager == null) {
+            mWallpaperManager = WallpaperManager.getInstance(context);
+            addOnColorsChangedListener(context);
+        }
+        WallpaperColors wallpaperColors = mWallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+        // Live wallpapers might not implement the WallpaperColors API.
+        if (wallpaperColors == null) {
+            mDarkText = false;
+        } else {
+            mDarkText = (wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT) != 0;
+        }
+
+         // Create a remote view for the digital clock.
+         final String packageName = context.getPackageName();
+         final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget);
+@@ -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);
+ 
+        // Apply the text color to the remote views.
+        if (mDarkText) {
+            rv.setTextColor(R.id.clock, resources.getColor(R.color.black));
+            rv.setTextColor(R.id.date, resources.getColor(R.color.black));
+            rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.black));
+        } else {
+            rv.setTextColor(R.id.clock, resources.getColor(R.color.white));
+            rv.setTextColor(R.id.date, resources.getColor(R.color.white));
+            rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.white));
+        }
+
+         final int smallestWorldCityListSizePx =
+                 resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size);
+         if (sizes.getListHeight() <= smallestWorldCityListSizePx) {
+@@ -416,6 +470,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
+         nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
+         nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
+ 
+        // Adjust the alarm icon text color before generating its bitmap.
+        nextAlarmIcon.setTextColor(context.getResources().getColor(mDarkText ? R.color.black : R.color.white));
+
+         // Measure and layout the sizer.
+         final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
+         final int heightSize = View.MeasureSpec.getSize(measuredSizes.mTargetHeightPx);
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch
+++ b/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch
@ -0,0 +1,26 @@
+From 99b3533fe66a7bdc71dd6c63c4ba6c75e2ef2082 Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sat, 6 Jun 2015 10:40:51 -0400
+Subject: [PATCH] NfcService: Disable NFC by default
+
+Change-Id: Ibe6abec7fa84c6fde476b8a083f57a3f61b50909
+---
+ src/com/android/nfc/NfcService.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
+index 3facdeeb..878b7e21 100644
+--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
+@@ -133,7 +133,7 @@ public class NfcService implements DeviceHostListener {
+     public static final String PREF = "NfcServicePrefs";
+ 
+     static final String PREF_NFC_ON = "nfc_on";
+-    static final boolean NFC_ON_DEFAULT = true;
+    static final boolean NFC_ON_DEFAULT = false;
+     static final String PREF_NDEF_PUSH_ON = "ndef_push_on";
+     static final boolean NDEF_PUSH_ON_DEFAULT = false;
+     static final String PREF_SECURE_NFC_ON = "secure_nfc_on";
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_apps_Settings/0001-Revert-DO-NOT-MERGE-Allow-a-settings-override-for-do.patch
+++ b/patches_platform_personal/packages_apps_Settings/0001-Revert-DO-NOT-MERGE-Allow-a-settings-override-for-do.patch
@ -0,0 +1,227 @@
+From d94a28d2f9f88d3fee4f2a71b2364bca23f4be8b Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 13 Mar 2022 11:22:48 +0000
+Subject: [PATCH] Revert "[DO NOT MERGE] Allow a settings override for
+ double-line clock"
+
+Sorry but I SAID NEVER!
+
+This reverts commit cb4836b4868adc1f06212ce82851a5f16169ab5c.
+
+Change-Id: I8b4b1354f23981f6edbe7f3c81ec4f511da3cc1a
+---
+ res/values/strings.xml                        |  4 -
+ res/xml/security_lockscreen_settings.xml      |  6 --
+ .../LockscreenClockPreferenceController.java  | 70 ---------------
+ ...ckscreenClockPreferenceControllerTest.java | 90 -------------------
+ 4 files changed, 170 deletions(-)
+ delete mode 100644 src/com/android/settings/display/LockscreenClockPreferenceController.java
+ delete mode 100644 tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
+
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 09d80c8814..8e55b8a4b8 100644
+--- a/res/values/strings.xml
+++ b/res/values/strings.xml
+@@ -13520,10 +13520,6 @@
+     <string name="lockscreen_trivial_controls_summary">Control external devices without unlocking your phone or tablet if allowed by the device controls app</string>
+     <!-- Trivial Device disabled controls summary [CHAR LIMIT=NONE] -->
+     <string name="lockscreen_trivial_disabled_controls_summary">To use, first turn on \u0022Show device controls\u0022</string>
+-    <!-- Lockscreen double-line clock summary [CHAR LIMIT=NONE] -->
+-    <string name="lockscreen_double_line_clock_summary">Show double-line clock when available</string>
+-    <!-- Lockscreen double-line clock toggle [CHAR LIMIT=60] -->
+-    <string name="lockscreen_double_line_clock_setting_toggle">Double-line clock</string>
+ 
+     <!-- Title for RTT setting. [CHAR LIMIT=NONE] -->
+     <string name="rtt_settings_title"></string>
+diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
+index cb3c69172e..3b3635ac45 100644
+--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
+@@ -78,12 +78,6 @@
+             android:title="@string/lockscreen_trivial_controls_setting_toggle"
+             android:summary="@string/lockscreen_trivial_controls_summary"
+             settings:controller="com.android.settings.display.ControlsTrivialPrivacyPreferenceController"/>
+-
+-        <SwitchPreference
+-            android:key="lockscreen_double_line_clock_switch"
+-            android:title="@string/lockscreen_double_line_clock_setting_toggle"
+-            android:summary="@string/lockscreen_double_line_clock_summary"
+-            settings:controller="com.android.settings.display.LockscreenClockPreferenceController" />
+     </PreferenceCategory>
+ 
+     <PreferenceCategory
+diff --git a/src/com/android/settings/display/LockscreenClockPreferenceController.java b/src/com/android/settings/display/LockscreenClockPreferenceController.java
+deleted file mode 100644
+index 70ae55eaf9..0000000000
+--- a/src/com/android/settings/display/LockscreenClockPreferenceController.java
+++ /dev/null
+@@ -1,70 +0,0 @@
+-/*
+- * Copyright (C) 2021 The Android Open Source Project
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package com.android.settings.display;
+-
+-import android.content.Context;
+-import android.provider.Settings;
+-
+-import androidx.preference.Preference;
+-
+-import com.android.settings.R;
+-import com.android.settings.core.TogglePreferenceController;
+-
+-/**
+- * Preference to enable/disable the large double-line clock on lockscreen
+- */
+-public class LockscreenClockPreferenceController extends TogglePreferenceController {
+-
+-    private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK;
+-
+-    public LockscreenClockPreferenceController(Context context, String preferenceKey) {
+-        super(context, preferenceKey);
+-    }
+-
+-    @Override
+-    public boolean isChecked() {
+-        return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1) != 0;
+-    }
+-
+-    @Override
+-    public boolean setChecked(boolean isChecked) {
+-        return Settings.Secure.putInt(mContext.getContentResolver(), SETTING_KEY,
+-                isChecked ? 1 : 0);
+-    }
+-
+-    @Override
+-    public CharSequence getSummary() {
+-        return mContext.getText(R.string.lockscreen_double_line_clock_summary);
+-    }
+-
+-    @Override
+-    public int getAvailabilityStatus() {
+-        return AVAILABLE;
+-    }
+-
+-    @Override
+-    public void updateState(Preference preference) {
+-        super.updateState(preference);
+-        preference.setEnabled(true);
+-        refreshSummary(preference);
+-    }
+-
+-    @Override
+-    public int getSliceHighlightMenuRes() {
+-        return R.string.menu_key_display;
+-    }
+-}
+diff --git a/tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
+deleted file mode 100644
+index 94f2dc6655..0000000000
+--- a/tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
+++ /dev/null
+@@ -1,90 +0,0 @@
+-/*
+- * Copyright (C) 2021 The Android Open Source Project
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package com.android.settings.display;
+-
+-import static com.google.common.truth.Truth.assertThat;
+-
+-import android.content.ContentResolver;
+-import android.content.Context;
+-import android.provider.Settings;
+-
+-import androidx.preference.Preference;
+-
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.mockito.Mock;
+-import org.mockito.MockitoAnnotations;
+-import org.robolectric.RobolectricTestRunner;
+-import org.robolectric.RuntimeEnvironment;
+-
+-@RunWith(RobolectricTestRunner.class)
+-public class LockscreenClockPreferenceControllerTest {
+-
+-    private static final String TEST_KEY = "test_key";
+-    private static final String SETTING_KEY = Settings.Secure.LOCKSCREEN_USE_DOUBLE_LINE_CLOCK;
+-
+-    private Context mContext;
+-    private ContentResolver mContentResolver;
+-    private LockscreenClockPreferenceController mController;
+-
+-    @Mock
+-    private Preference mPreference;
+-
+-    @Before
+-    public void setUp() {
+-        MockitoAnnotations.initMocks(this);
+-        mContext = RuntimeEnvironment.application;
+-        mContentResolver = mContext.getContentResolver();
+-        mController = new LockscreenClockPreferenceController(mContext, TEST_KEY);
+-    }
+-
+-    @Test
+-    public void isChecked_SettingIs1_returnTrue() {
+-        Settings.Secure.putInt(mContentResolver, SETTING_KEY, 1);
+-
+-        assertThat(mController.isChecked()).isTrue();
+-    }
+-
+-    @Test
+-    public void isChecked_SettingIs0_returnFalse() {
+-        Settings.Secure.putInt(mContentResolver, SETTING_KEY, 0);
+-
+-        assertThat(mController.isChecked()).isFalse();
+-    }
+-
+-    @Test
+-    public void isChecked_SettingIsNotSet_returnTrue() {
+-        Settings.Secure.putString(mContentResolver, SETTING_KEY, null);
+-
+-        assertThat(mController.isChecked()).isTrue();
+-    }
+-
+-    @Test
+-    public void setChecked_true_SettingIsNot0() {
+-        mController.setChecked(true);
+-
+-        assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isNotEqualTo(0);
+-    }
+-
+-    @Test
+-    public void setChecked_false_SettingIs0() {
+-        mController.setChecked(false);
+-
+-        assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);
+-    }
+-}
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch
+++ b/patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch
@ -0,0 +1,93 @@
+From 1f218b4e6572822d99ec46c1bfd65e7ff023c0d3 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 28 Oct 2021 02:30:59 +0000
+Subject: [PATCH 1/2] Trebuchet: Make overview scrim transparent again
+
+Also revert texts/buttons to workspace color
+
+Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
+---
+ quickstep/res/values/styles.xml                            | 4 ++--
+ quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
+ res/color-v31/overview_scrim.xml                           | 2 +-
+ res/color-v31/overview_scrim_dark.xml                      | 2 +-
+ res/color/overview_button.xml                              | 6 +++---
+ 5 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
+index 7225220876..59cce932a2 100644
+--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
+@@ -142,7 +142,7 @@
+         parent="@android:style/Widget.DeviceDefault.Button.Borderless">
+         <item name="android:textColor">@color/overview_button</item>
+         <item name="android:drawableTint">@color/overview_button</item>
+-        <item name="android:tint">?android:attr/textColorPrimary</item>
+        <item name="android:tint">?attr/workspaceTextColor</item>
+         <item name="android:drawablePadding">8dp</item>
+         <item name="android:textAllCaps">false</item>
+     </style>
+@@ -182,4 +182,4 @@
+         <item name="android:textSize">24sp</item>
+         <item name="android:lines">2</item>
+     </style>
+-</resources>
+\ No newline at end of file
+</resources>
+diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
+index 4a4202ecc6..58e8c2508a 100644
+--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
+@@ -717,7 +717,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+         mEmptyIcon.setCallback(this);
+         mEmptyMessage = context.getText(R.string.recents_empty_message);
+         mEmptyMessagePaint = new TextPaint();
+-        mEmptyMessagePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary));
+        mEmptyMessagePaint.setColor(Themes.getAttrColor(context, R.attr.workspaceTextColor));
+         mEmptyMessagePaint.setTextSize(getResources()
+                 .getDimension(R.dimen.recents_empty_message_text_size));
+         mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context),
+diff --git a/res/color-v31/overview_scrim.xml b/res/color-v31/overview_scrim.xml
+index 212518ff65..894997c59a 100644
+--- a/res/color-v31/overview_scrim.xml
+++ b/res/color-v31/overview_scrim.xml
+@@ -14,5 +14,5 @@
+      limitations under the License.
+ -->
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="@android:color/system_neutral2_200" />
+  <item android:color="@android:color/transparent" />
+ </selector>
+diff --git a/res/color-v31/overview_scrim_dark.xml b/res/color-v31/overview_scrim_dark.xml
+index 2ab8ecdec9..894997c59a 100644
+--- a/res/color-v31/overview_scrim_dark.xml
+++ b/res/color-v31/overview_scrim_dark.xml
+@@ -14,5 +14,5 @@
+      limitations under the License.
+ -->
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+-  <item android:color="@android:color/system_neutral1_500" android:lStar="35" />
+  <item android:color="@android:color/transparent" />
+ </selector>
+diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml
+index aa48b78604..e638ac2d4a 100644
+--- a/res/color/overview_button.xml
+++ b/res/color/overview_button.xml
+@@ -2,10 +2,10 @@
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+     <item
+         android:alpha="1"
+-        android:color="?android:attr/textColorPrimary"
+        android:color="?attr/workspaceTextColor"
+         android:state_enabled="true" />
+     <item
+         android:alpha="?android:disabledAlpha"
+-        android:color="?android:attr/textColorPrimary"
+        android:color="?attr/workspaceTextColor"
+         android:state_enabled="false" />
+-</selector>
+\ No newline at end of file
+</selector>
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch
+++ b/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch
@ -0,0 +1,82 @@
+From 3b51af674b9aa916e86fcfe0034ba3dfc0359ae1 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Fri, 18 Mar 2022 08:42:18 +0000
+Subject: [PATCH 2/2] Trebuchet: Kill haptics in recents
+
+This partially reverts commit cc5c8843dfebfa92057b6ce8904ac58cd05ffaef.
+
+Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
+---
+ .../NoButtonQuickSwitchTouchController.java   |  8 --------
+ .../TaskViewTouchController.java              |  5 -----
+ .../android/quickstep/views/RecentsView.java  | 19 -------------------
+ 3 files changed, 32 deletions(-)
+
+diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+index 53dc9dd873..c8d89edb97 100644
+--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+@@ -429,14 +429,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
+             nonOverviewAnim.setFloatValues(startProgress, endProgress);
+             mNonOverviewAnim.dispatchOnStart();
+         }
+-        if (targetState == QUICK_SWITCH) {
+-            // Navigating to quick switch, add scroll feedback since the first time is not
+-            // considered a scroll by the RecentsView.
+-            VibratorWrapper.INSTANCE.get(mLauncher).vibrate(
+-                    RecentsView.SCROLL_VIBRATION_PRIMITIVE,
+-                    RecentsView.SCROLL_VIBRATION_PRIMITIVE_SCALE,
+-                    RecentsView.SCROLL_VIBRATION_FALLBACK);
+-        }
+ 
+         nonOverviewAnim.setDuration(Math.max(xDuration, yDuration));
+         mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState));
+diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+index ca7f633bbc..61ee609535 100644
+--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+@@ -367,11 +367,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
+         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
+                 velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
+                 mEndDisplacement, animationDuration);
+-        if (goingUp && goingToEnd && !mIsDismissHapticRunning) {
+-            VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE,
+-                    TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK);
+-            mIsDismissHapticRunning = true;
+-        }
+     }
+ 
+     private void clearState() {
+diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
+index 58e8c2508a..786db49be5 100644
+--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
+@@ -1339,25 +1339,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
+         }
+     }
+ 
+-    @Override
+-    protected void onEdgeAbsorbingScroll() {
+-        vibrateForScroll();
+-    }
+-
+-    @Override
+-    protected void onScrollOverPageChanged() {
+-        vibrateForScroll();
+-    }
+-
+-    private void vibrateForScroll() {
+-        long now = SystemClock.uptimeMillis();
+-        if (now - mScrollLastHapticTimestamp > mScrollHapticMinGapMillis) {
+-            mScrollLastHapticTimestamp = now;
+-            VibratorWrapper.INSTANCE.get(mContext).vibrate(SCROLL_VIBRATION_PRIMITIVE,
+-                    SCROLL_VIBRATION_PRIMITIVE_SCALE, SCROLL_VIBRATION_FALLBACK);
+-        }
+-    }
+-
+     @Override
+     protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) {
+         // Enables swiping to the left or right only if the task overlay is not modal.
+-- 
+2.25.1
+
--- a/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch
+++ b/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch
@ -0,0 +1,87 @@
+From b09034c7e5f9bbc2d29c3f10452259956fcb9f46 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 16 Oct 2021 00:33:15 +0000
+Subject: [PATCH] Replace captive portal URLs globally
+
+...so that it works even without a SIM inserted, which is a typical usecase of mine
+URLs from Chinese OEM UIs are faster and more reliable than g.cn and other int'l ones
+
+Change-Id: Ic3e124b2b62838a2bcf1dad0d670515f3d056964
+---
+ res/values-mcc460/config.xml | 31 -------------------------------
+ res/values/config.xml        |  7 +++----
+ 2 files changed, 3 insertions(+), 35 deletions(-)
+ delete mode 100644 res/values-mcc460/config.xml
+
+diff --git a/res/values-mcc460/config.xml b/res/values-mcc460/config.xml
+deleted file mode 100644
+index 3c4b4933..00000000
+--- a/res/values-mcc460/config.xml
+++ /dev/null
+@@ -1,31 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<resources>
+-    <!-- Network validation URL configuration for devices using a Chinese SIM (MCC 460).
+-         The below URLs are often whitelisted by captive portals, so they should not be used in the
+-         general case as this could degrade the user experience (portals not detected properly).
+-         However in China the default URLs are not accessible in general. The below alternatives
+-         should allow users to connect to local networks normally. -->
+-    <!-- default_captive_portal_http_url is not configured as overlayable so
+-         OEMs that wish to change captive_portal_http_url configuration must
+-         do so via configuring runtime resource overlay to
+-         config_captive_portal_http_url and *NOT* by changing or overlaying
+-         this resource. It will break if the enforcement of overlayable starts.
+-         -->
+-    <string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.cn/generate_204</string>
+-    <!-- default_captive_portal_https_url is not configured as overlayable so
+-         OEMs that wish to change captive_portal_https_url configuration must
+-         do so via configuring runtime resource overlay to
+-         config_captive_portal_https_url and *NOT* by changing or overlaying
+-         this resource. It will break if the enforcement of overlayable starts.
+-         -->
+-    <string name="default_captive_portal_https_url" translatable="false">https://connectivitycheck.gstatic.cn/generate_204</string>
+-    <!-- default_captive_portal_fallback_urls is not configured as overlayable
+-         so OEMs that wish to change captive_portal_fallback_urls configuration
+-         must do so via configuring runtime resource overlay to
+-         config_captive_portal_fallback_urls and *NOT* by changing or overlaying
+-         this resource. It will break if the enforcement of overlayable starts.
+-         -->
+-    <string-array name="default_captive_portal_fallback_urls" translatable="false">
+-        <item>http://www.googleapis.cn/generate_204</item>
+-    </string-array>
+-</resources>
+diff --git a/res/values/config.xml b/res/values/config.xml
+index 805ca041..61297dda 100644
+--- a/res/values/config.xml
+++ b/res/values/config.xml
+@@ -13,7 +13,7 @@
+          config_captive_portal_http_url and *NOT* by changing or overlaying
+          this resource. It will break if the enforcement of overlayable starts.
+          -->
+-    <string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.com/generate_204</string>
+    <string name="default_captive_portal_http_url" translatable="false">http://conn4.coloros.com/generate204</string>
+     <!-- HTTPS URL for network validation, to use for confirming internet connectivity. -->
+     <!-- default_captive_portal_https_url is not configured as overlayable so
+          OEMs that wish to change captive_portal_https_url configuration must
+@@ -21,7 +21,7 @@
+          config_captive_portal_https_url and *NOT* by changing or overlaying
+          this resource. It will break if the enforcement of overlayable starts.
+          -->
+-    <string name="default_captive_portal_https_url" translatable="false">https://www.google.com/generate_204</string>
+    <string name="default_captive_portal_https_url" translatable="false">https://conn4.coloros.com/generate204</string>
+ 
+     <!-- List of fallback URLs to use for detecting captive portals. -->
+     <!-- default_captive_portal_fallback_urls is not configured as overlayable
+@@ -31,8 +31,7 @@
+          this resource. It will break if the enforcement of overlayable starts.
+          -->
+     <string-array name="default_captive_portal_fallback_urls" translatable="false">
+-        <item>http://www.google.com/gen_204</item>
+-        <item>http://play.googleapis.com/generate_204</item>
+        <item>http://connect.rom.miui.com/generate_204</item>
+     </string-array>
+     <!-- Configuration hooks for the above settings.
+          Empty by default but may be overridden by RROs. -->
+-- 
+2.25.1
+
--- a/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch
+++ b/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch
@ -0,0 +1,36 @@
+From 2386227e0541aa061579dd9c34da867174a7d6a2 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 20 Jun 2021 09:09:15 +0000
+Subject: [PATCH 1/4] build: Integrate prop modifications (2/2)
+
+Change-Id: I076973f902ab20011964e50955e4326c18d5b34e
+---
+ build/core/main_version.mk | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/build/core/main_version.mk b/build/core/main_version.mk
+index 28044e2c..c5aa9617 100644
+--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
+@@ -5,17 +5,12 @@ ADDITIONAL_SYSTEM_PROPERTIES += \
+ endif
+ 
+ # LineageOS System Version
+# Do not set Display Versions here, due to Makefile not playing nice with spaces
+ ADDITIONAL_SYSTEM_PROPERTIES += \
+-    ro.lineage.version=$(LINEAGE_VERSION) \
+     ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
+     ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
+-    ro.modversion=$(LINEAGE_VERSION) \
+     ro.lineagelegal.url=https://lineageos.org/legal
+ 
+-# LineageOS Platform Display Version
+-ADDITIONAL_SYSTEM_PROPERTIES += \
+-    ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION)
+-
+ # LineageOS Platform SDK Version
+ ADDITIONAL_SYSTEM_PROPERTIES += \
+     ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)
+-- 
+2.25.1
+
--- a/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch
+++ b/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch
@ -0,0 +1,40 @@
+From 209602b004deebac7846b67def29f3281d864080 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 16 Oct 2021 00:41:07 +0000
+Subject: [PATCH 2/4] build: Remove Stk (2/2)
+
+Change-Id: I4e1cfacd296e47ef1731f3c32555089a5fca6f0c
+---
+ config/data_only.mk | 4 ----
+ config/telephony.mk | 3 +--
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/config/data_only.mk b/config/data_only.mk
+index 5ff877c9..ab70301b 100644
+--- a/config/data_only.mk
+++ b/config/data_only.mk
+@@ -1,7 +1,3 @@
+ # World APN list
+ PRODUCT_PACKAGES += \
+     apns-conf.xml
+-
+-# Telephony packages
+-PRODUCT_PACKAGES += \
+-    Stk
+diff --git a/config/telephony.mk b/config/telephony.mk
+index 6adf48d9..e63b320d 100644
+--- a/config/telephony.mk
+++ b/config/telephony.mk
+@@ -8,8 +8,7 @@ PRODUCT_PACKAGES += \
+ 
+ # Telephony packages
+ PRODUCT_PACKAGES += \
+-    messaging \
+-    Stk
+    messaging
+ 
+ # Default ringtone
+ PRODUCT_PRODUCT_PROPERTIES += \
+-- 
+2.25.1
+
--- a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
+++ b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch
@ -0,0 +1,30 @@
+From d9e352c11ee8738439b73ff5f02429da3f045cc5 Mon Sep 17 00:00:00 2001
+From: AndyCGYan <GeForce8800Ultra@gmail.com>
+Date: Mon, 1 Jul 2019 07:03:04 +0000
+Subject: [PATCH 3/4] vendor_lineage: Ignore neverallows... again
+
+Because unofficial builds are better than no builds!
+
+Change-Id: I4b19d09b28f79c6f5020bf03fdf8931145bca03a
+---
+ build/core/config.mk | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/build/core/config.mk b/build/core/config.mk
+index f2e595ff..d6d036a9 100644
+--- a/build/core/config.mk
+++ b/build/core/config.mk
+@@ -20,5 +20,10 @@ FRAMEWORK_LINEAGE_PLATFORM_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_current.
+ FRAMEWORK_LINEAGE_PLATFORM_REMOVED_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_removed.txt
+ FRAMEWORK_LINEAGE_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/apicheck_msg_current.txt
+ 
+# We modify several neverallows, so let the build proceed
+ifneq ($(TARGET_BUILD_VARIANT),user)
+SELINUX_IGNORE_NEVERALLOWS := true
+endif
+
+ # Rules for QCOM targets
+ include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk
+-- 
+2.25.1
+
--- a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch
+++ b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch
--- a/patches_treble/build_make/0001-Remove-init.vndk-nodef.rc.patch
+++ b/patches_treble/build_make/0001-Remove-init.vndk-nodef.rc.patch
@ -0,0 +1,75 @@
+From faff60c8814e2d31519d86e92faf08761a1d1de1 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 8 Dec 2021 07:04:53 +0000
+Subject: [PATCH] Remove init.vndk-nodef.rc
+
+This partially reverts "Deprecate VNDK-lite support from Legacy GSI".
+
+Paired with https://github.com/LineageOS/android_system_core/commit/0b265e35ddf42638fa807f5349a10c40e3d46446, it kicks permissive devices into bootloader.
+Given that GSI+permissive won't ever be a Lineage official scenario, revert this only on our side.
+Thanks @Kethen for the insight!
+
+Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9
+---
+ target/product/gsi/Android.mk         | 13 -------------
+ target/product/gsi/init.gsi.rc        |  2 --
+ target/product/gsi/init.vndk-nodef.rc |  3 ---
+ target/product/gsi_release.mk         |  1 -
+ 4 files changed, 19 deletions(-)
+ delete mode 100644 target/product/gsi/init.vndk-nodef.rc
+
+diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
+index 85e551d3f..c1f37e07f 100644
+--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
+@@ -247,16 +247,3 @@ LOCAL_SYSTEM_EXT_MODULE := true
+ LOCAL_MODULE_RELATIVE_PATH := init
+ 
+ include $(BUILD_PREBUILT)
+-
+-
+-include $(CLEAR_VARS)
+-LOCAL_MODULE := init.vndk-nodef.rc
+-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+-LOCAL_LICENSE_CONDITIONS := notice
+-LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
+-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+-LOCAL_MODULE_CLASS := ETC
+-LOCAL_SYSTEM_EXT_MODULE := true
+-LOCAL_MODULE_RELATIVE_PATH := gsi
+-
+-include $(BUILD_PREBUILT)
+diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc
+index 69c8e467b..c6faba78d 100644
+--- a/target/product/gsi/init.gsi.rc
+++ b/target/product/gsi/init.gsi.rc
+@@ -1,5 +1,3 @@
+ #
+ # Android init script for GSI required initialization
+ #
+-
+-import /system/system_ext/etc/gsi/init.vndk-${ro.vndk.version:-nodef}.rc
+diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc
+deleted file mode 100644
+index 1b141a05e..000000000
+--- a/target/product/gsi/init.vndk-nodef.rc
+++ /dev/null
+@@ -1,3 +0,0 @@
+-on early-init
+-    # Reboot if BOARD_VNDK_VERSION is not defined
+-    exec - root -- /system/bin/reboot bootloader
+diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
+index 74501cd1f..575e90b14 100644
+--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
+@@ -60,7 +60,6 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
+ PRODUCT_PACKAGES += \
+     gsi_skip_mount.cfg \
+     init.gsi.rc \
+-    init.vndk-nodef.rc \
+ 
+ # Support additional VNDK snapshots
+ PRODUCT_EXTRA_VNDK_VERSIONS := \
+-- 
+2.25.1
+
--- a/patches_treble/frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
+++ b/patches_treble/frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
@ -0,0 +1,313 @@
+From 51deb8e31ca57f19420277cc92b26375233e9050 Mon Sep 17 00:00:00 2001
+From: Peter Cai <peter@typeblog.net>
+Date: Thu, 18 Aug 2022 15:44:46 -0400
+Subject: [PATCH 1/5] APM: Restore S, R and Q behavior respectively for
+ telephony audio
+
+This conditionally reverts part of b2e5cb (T), 51c9cc (S) and afd4ce (R)
+when the VNDK version is equal to or before S, R and Q respectively.
+
+On R, commit afd4ce made it so that both HW and SW bridging go through
+`createAudioPatch()`, which is broken on some devices such as on MTK Q
+vendor, because their HAL do not support HW patching via the newer
+`createAudioPatch()` method. Instead, the patching on Q was done through
+`setOutputDevices()`.
+
+On S, commit 51c9cc refactored the related code again such that HW
+bridging for the Rx direction is essentially removed, replaced with SW
+bridging through `startAudioSource()`. This is, again, broken on MTK R
+vendor devices.
+
+On T, commit b2e5cb applied the same SW bridging to the Tx direction.
+
+All of these commits rely on assumptions that are not tested through
+VTS and just presumed to be true. Although we can blame MTK for not
+supporting all the possible cases in their HAL, it will not fix
+anything, and really frameworks code should not depend on such untested
+assumptions.
+
+To work around said issues, we restore old behavior from S, R and Q
+relying on the value of `ro.vndk.version`.
+
+Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
+---
+ .../managerdefault/AudioPolicyManager.cpp     | 193 +++++++++++++-----
+ .../managerdefault/AudioPolicyManager.h       |   3 +
+ 2 files changed, 141 insertions(+), 55 deletions(-)
+
+diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+index 744609f27b..224dae3820 100644
+--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+@@ -675,6 +675,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
+     disconnectTelephonyAudioSource(mCallRxSourceClient);
+     disconnectTelephonyAudioSource(mCallTxSourceClient);
+ 
+    // release existing RX patch if any
+    if (mCallRxPatch != 0) {
+        releaseAudioPatchInternal(mCallRxPatch->getHandle());
+        mCallRxPatch.clear();
+    }
+    // release TX patch if any
+    if (mCallTxPatch != 0) {
+        releaseAudioPatchInternal(mCallTxPatch->getHandle());
+        mCallTxPatch.clear();
+    }
+
+     auto telephonyRxModule =
+         mHwModules.getModuleForDeviceType(AUDIO_DEVICE_IN_TELEPHONY_RX, AUDIO_FORMAT_DEFAULT);
+     auto telephonyTxModule =
+@@ -697,9 +708,20 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
+             ALOGE("%s() no telephony Tx and/or RX device", __func__);
+             return INVALID_OPERATION;
+         }
+-        // createAudioPatchInternal now supports both HW / SW bridging
+-        createRxPatch = true;
+-        createTxPatch = true;
+        if (property_get_int32("ro.vndk.version", 31) >= 30) {
+            // createAudioPatchInternal now supports both HW / SW bridging
+            createRxPatch = true;
+            createTxPatch = true;
+        } else {
+            // pre-R behavior: some devices before VNDK 30 do not support createAudioPatch correctly
+            // for HW bridging even though they declare support for it
+            // do not create a patch (aka Sw Bridging) if Primary HW module has declared supporting a
+            // route between telephony RX to Sink device and Source device to telephony TX
+            ALOGI("%s() Using pre-R behavior for createRxPatch and createTxPatch", __func__);
+            const auto &primaryModule = telephonyRxModule;
+            createRxPatch = !primaryModule->supportsPatch(rxSourceDevice, rxDevices.itemAt(0));
+            createTxPatch = !primaryModule->supportsPatch(txSourceDevice, txSinkDevice);
+        }
+     } else {
+         // If the RX device is on the primary HW module, then use legacy routing method for
+         // voice calls via setOutputDevice() on primary output.
+@@ -716,7 +738,14 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
+     if (!createRxPatch) {
+         muteWaitMs = setOutputDevices(mPrimaryOutput, rxDevices, true, delayMs);
+     } else { // create RX path audio patch
+-        connectTelephonyRxAudioSource();
+        if (property_get_int32("ro.vndk.version", 31) >= 31) {
+            connectTelephonyRxAudioSource();
+        } else {
+            // pre-S behavior: some devices do not support SW bridging correctly when HW bridge is
+            // available through createAudioPatch(); startAudioSource() forces SW bridging.
+            ALOGI("%s() Using pre-S behavior to create HW Rx patch", __func__);
+            mCallRxPatch = createTelephonyPatch(true /*isRx*/, rxDevices.itemAt(0), delayMs);
+        }
+         // If the TX device is on the primary HW module but RX device is
+         // on other HW module, SinkMetaData of telephony input should handle it
+         // assuming the device uses audio HAL V5.0 and above
+@@ -731,7 +760,12 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
+                 closeActiveClients(activeDesc);
+             }
+         }
+-        connectTelephonyTxAudioSource(txSourceDevice, txSinkDevice, delayMs);
+        if (property_get_int32("ro.vndk.version", 33) >= 33) {
+            connectTelephonyTxAudioSource(txSourceDevice, txSinkDevice, delayMs);
+        } else {
+            // pre-T behavior: hw bridging for tx too; skip the SwOutput
+            mCallTxPatch = createTelephonyPatch(false /*isRx*/, txSourceDevice, delayMs);
+        }
+     }
+     if (waitMs != nullptr) {
+         *waitMs = muteWaitMs;
+@@ -739,6 +773,36 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
+     return NO_ERROR;
+ }
+ 
+sp<AudioPatch> AudioPolicyManager::createTelephonyPatch(
+        bool isRx, const sp<DeviceDescriptor> &device, uint32_t delayMs) {
+    PatchBuilder patchBuilder;
+
+    if (device == nullptr) {
+        return nullptr;
+    }
+
+    // @TODO: still ignoring the address, or not dealing platform with multiple telephony devices
+    if (isRx) {
+        patchBuilder.addSink(device).
+                addSource(mAvailableInputDevices.getDevice(
+                    AUDIO_DEVICE_IN_TELEPHONY_RX, String8(), AUDIO_FORMAT_DEFAULT));
+    } else {
+        patchBuilder.addSource(device).
+                addSink(mAvailableOutputDevices.getDevice(
+                    AUDIO_DEVICE_OUT_TELEPHONY_TX, String8(), AUDIO_FORMAT_DEFAULT));
+    }
+
+    audio_patch_handle_t patchHandle = AUDIO_PATCH_HANDLE_NONE;
+    status_t status =
+            createAudioPatchInternal(patchBuilder.patch(), &patchHandle, mUidCached, delayMs, nullptr);
+    ssize_t index = mAudioPatches.indexOfKey(patchHandle);
+    if (status != NO_ERROR || index < 0) {
+        ALOGW("%s() error %d creating %s audio patch", __func__, status, isRx ? "RX" : "TX");
+        return nullptr;
+    }
+    return mAudioPatches.valueAt(index);
+}
+
+ bool AudioPolicyManager::isDeviceOfModule(
+         const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
+     sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
+@@ -4520,76 +4584,95 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
+                 // in config XML to reach the sink so that is can be declared as available.
+                 audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
+                 sp<SwAudioOutputDescriptor> outputDesc = nullptr;
+-                if (!sourceDesc->isInternal()) {
+-                    // take care of dynamic routing for SwOutput selection,
+-                    audio_attributes_t attributes = sourceDesc->attributes();
+-                    audio_stream_type_t stream = sourceDesc->stream();
+-                    audio_attributes_t resultAttr;
+-                    audio_config_t config = AUDIO_CONFIG_INITIALIZER;
+-                    config.sample_rate = sourceDesc->config().sample_rate;
+-                    config.channel_mask = sourceDesc->config().channel_mask;
+-                    config.format = sourceDesc->config().format;
+-                    audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;
+-                    audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE;
+-                    bool isRequestedDeviceForExclusiveUse = false;
+-                    output_type_t outputType;
+-                    bool isSpatialized;
+-                    getOutputForAttrInt(&resultAttr, &output, AUDIO_SESSION_NONE, &attributes,
+-                                        &stream, sourceDesc->uid(), &config, &flags,
+-                                        &selectedDeviceId, &isRequestedDeviceForExclusiveUse,
+-                                        nullptr, &outputType, &isSpatialized);
+-                    if (output == AUDIO_IO_HANDLE_NONE) {
+-                        ALOGV("%s no output for device %s",
+-                              __FUNCTION__, sinkDevice->toString().c_str());
+-                        return INVALID_OPERATION;
+-                    }
+-                    outputDesc = mOutputs.valueFor(output);
+-                    if (outputDesc->isDuplicated()) {
+-                        ALOGE("%s output is duplicated", __func__);
+-                        return INVALID_OPERATION;
+-                    }
+-                    sourceDesc->setSwOutput(outputDesc);
+-                } else {
+-                    // Same for "raw patches" aka created from createAudioPatch API
+-                    SortedVector<audio_io_handle_t> outputs =
+                if (sourceDesc != nullptr) {
+                    if (!sourceDesc->isInternal()) {
+                        // take care of dynamic routing for SwOutput selection,
+                        audio_attributes_t attributes = sourceDesc->attributes();
+                        audio_stream_type_t stream = sourceDesc->stream();
+                        audio_attributes_t resultAttr;
+                        audio_config_t config = AUDIO_CONFIG_INITIALIZER;
+                        config.sample_rate = sourceDesc->config().sample_rate;
+                        config.channel_mask = sourceDesc->config().channel_mask;
+                        config.format = sourceDesc->config().format;
+                        audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;
+                        audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE;
+                        bool isRequestedDeviceForExclusiveUse = false;
+                        output_type_t outputType;
+                        bool isSpatialized;
+                        getOutputForAttrInt(&resultAttr, &output, AUDIO_SESSION_NONE, &attributes,
+                                &stream, sourceDesc->uid(), &config, &flags,
+                                &selectedDeviceId, &isRequestedDeviceForExclusiveUse,
+                                nullptr, &outputType, &isSpatialized);
+                        if (output == AUDIO_IO_HANDLE_NONE) {
+                            ALOGV("%s no output for device %s",
+                                    __FUNCTION__, sinkDevice->toString().c_str());
+                            return INVALID_OPERATION;
+                        }
+                        outputDesc = mOutputs.valueFor(output);
+                        if (outputDesc->isDuplicated()) {
+                            ALOGE("%s output is duplicated", __func__);
+                            return INVALID_OPERATION;
+                        }
+                        sourceDesc->setSwOutput(outputDesc);
+                    } else {
+                        // Same for "raw patches" aka created from createAudioPatch API
+                        SortedVector<audio_io_handle_t> outputs =
+                             getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
+-                    // if the sink device is reachable via an opened output stream, request to
+-                    // go via this output stream by adding a second source to the patch
+-                    // description
+-                    output = selectOutput(outputs);
+-                    if (output == AUDIO_IO_HANDLE_NONE) {
+-                        ALOGE("%s no output available for internal patch sink", __func__);
+-                        return INVALID_OPERATION;
+-                    }
+-                    outputDesc = mOutputs.valueFor(output);
+-                    if (outputDesc->isDuplicated()) {
+-                        ALOGV("%s output for device %s is duplicated",
+-                              __func__, sinkDevice->toString().c_str());
+-                        return INVALID_OPERATION;
+                        // if the sink device is reachable via an opened output stream, request to
+                        // go via this output stream by adding a second source to the patch
+                        // description
+                        output = selectOutput(outputs);
+                        if (output == AUDIO_IO_HANDLE_NONE) {
+                            ALOGE("%s no output available for internal patch sink", __func__);
+                            return INVALID_OPERATION;
+                        }
+                        outputDesc = mOutputs.valueFor(output);
+                        if (outputDesc->isDuplicated()) {
+                            ALOGV("%s output for device %s is duplicated",
+                                    __func__, sinkDevice->toString().c_str());
+                            return INVALID_OPERATION;
+                        }
+                        sourceDesc->setSwOutput(outputDesc);
+                     }
+-                    sourceDesc->setSwOutput(outputDesc);
+                 }
+                 // create a software bridge in PatchPanel if:
+                 // - source and sink devices are on different HW modules OR
+                 // - audio HAL version is < 3.0
+                 // - audio HAL version is >= 3.0 but no route has been declared between devices
+-                // - called from startAudioSource (aka sourceDesc is not internal) and source device
+                // - called from startAudioSource (aka sourceDesc is neither null nor internal) and source device
+                 //   does not have a gain controller
+                 if (!srcDevice->hasSameHwModuleAs(sinkDevice) ||
+                         (srcDevice->getModuleVersionMajor() < 3) ||
+                         !srcDevice->getModule()->supportsPatch(srcDevice, sinkDevice) ||
+-                        (!sourceDesc->isInternal() &&
+                        ((sourceDesc != nullptr && !sourceDesc->isInternal()) &&
+                          srcDevice->getAudioPort()->getGains().size() == 0)) {
+                     // support only one sink device for now to simplify output selection logic
+                     if (patch->num_sinks > 1) {
+                         return INVALID_OPERATION;
+                     }
+-                    sourceDesc->setUseSwBridge();
+                    if (sourceDesc == nullptr) {
+                        SortedVector<audio_io_handle_t> outputs =
+                                getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
+                        // if the sink device is reachable via an opened output stream, request to
+                        // go via this output stream by adding a second source to the patch
+                        // description
+                        output = selectOutput(outputs);
+                        if (output != AUDIO_IO_HANDLE_NONE) {
+                            outputDesc = mOutputs.valueFor(output);
+                            if (outputDesc->isDuplicated()) {
+                                ALOGV("%s output for device %s is duplicated",
+                                      __FUNCTION__, sinkDevice->toString().c_str());
+                                return INVALID_OPERATION;
+                            }
+                        }
+                    } else {
+                        sourceDesc->setUseSwBridge();
+                    }
+                     if (outputDesc != nullptr) {
+                         audio_port_config srcMixPortConfig = {};
+                         outputDesc->toAudioPortConfig(&srcMixPortConfig, nullptr);
+                         // for volume control, we may need a valid stream
+-                        srcMixPortConfig.ext.mix.usecase.stream = !sourceDesc->isInternal() ?
+                        srcMixPortConfig.ext.mix.usecase.stream = (sourceDesc != nullptr && !sourceDesc->isInternal()) ?
+                                     mEngine->getStreamTypeForAttributes(sourceDesc->attributes()) :
+                                     AUDIO_STREAM_PATCH;
+                         patchBuilder.addSource(srcMixPortConfig);
+diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
+index db0ee15de8..97fa6f6f81 100644
+--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
+@@ -938,6 +938,9 @@ protected:
+ 
+         SoundTriggerSessionCollection mSoundTriggerSessions;
+ 
+        sp<AudioPatch> mCallTxPatch;
+        sp<AudioPatch> mCallRxPatch;
+
+         HwAudioOutputCollection mHwOutputs;
+         SourceClientCollection mAudioSources;
+ 
+-- 
+2.37.2
+
--- a/patches_treble/frameworks_av/0002-APM-Optionally-force-load-audio-policy-for-system-si.patch
+++ b/patches_treble/frameworks_av/0002-APM-Optionally-force-load-audio-policy-for-system-si.patch
@ -0,0 +1,61 @@
+From 5def9ad1a26e28d517666e34301dc725c1660e36 Mon Sep 17 00:00:00 2001
+From: Peter Cai <peter@typeblog.net>
+Date: Wed, 24 Aug 2022 15:42:39 -0400
+Subject: [PATCH 2/5] APM: Optionally force-load audio policy for system-side
+ bt audio HAL
+
+Required to support our system-side bt audio implementation, i.e.
+`sysbta`.
+
+Co-authored-by: Pierre-Hugues Husson <phh@phh.me>
+Change-Id: I279fff541a531f922f3fa55b8f14d00237db59ff
+---
+ .../managerdefinitions/src/Serializer.cpp     | 25 +++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+index d446e9667b..f5233f2a42 100644
+--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+@@ -25,6 +25,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/xinclude.h>
+ #include <media/convert.h>
+#include <cutils/properties.h>
+ #include <utils/Log.h>
+ #include <utils/StrongPointer.h>
+ #include <utils/Errors.h>
+@@ -890,6 +891,30 @@ status_t PolicySerializer::deserialize(const char *configFile, AudioPolicyConfig
+     if (status != NO_ERROR) {
+         return status;
+     }
+
+   // Remove modules called bluetooth, bluetooth_qti or a2dp, and inject our own
+    if (property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)) {
+	    for (auto it = modules.begin(); it != modules.end(); it++) {
+		    const char *name = (*it)->getName();
+		    if (strcmp(name, "a2dp") == 0 ||
+				    strcmp(name, "a2dpsink") == 0 ||
+				    strcmp(name, "bluetooth") == 0 ||
+				    strcmp(name, "bluetooth_qti") == 0) {
+
+			    ALOGE("Removed module %s\n", name);
+			    it = modules.erase(it);
+		    }
+		    if (it == modules.end()) break;
+	    }
+	    const char* a2dpFileName = "/system/etc/sysbta_audio_policy_configuration.xml";
+	    if (version == "7.0")
+		    a2dpFileName = "/system/etc/sysbta_audio_policy_configuration_7_0.xml";
+	    auto doc = make_xmlUnique(xmlParseFile(a2dpFileName));
+	    xmlNodePtr root = xmlDocGetRootElement(doc.get());
+	    auto maybeA2dpModule = deserialize<ModuleTraits>(root, config);
+	    modules.add(std::get<1>(maybeA2dpModule));
+    }
+
+     config->setHwModules(modules);
+ 
+     // Global Configuration
+-- 
+2.37.2
+
--- a/patches_treble/frameworks_av/0003-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
+++ b/patches_treble/frameworks_av/0003-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
@ -0,0 +1,79 @@
+From e31fc6f3f79848e6f7e7b1b4abe82aa26571cf7b Mon Sep 17 00:00:00 2001
+From: Peter Cai <peter@typeblog.net>
+Date: Thu, 25 Aug 2022 13:30:29 -0400
+Subject: [PATCH 3/5] APM: Remove A2DP audio ports from the primary HAL
+
+These ports defined in the primary HAL are intended for A2DP offloading,
+however they do not work in general on GSIs, and will interfere with
+sysbta, the system-side generic bluetooth audio implementation.
+
+Remove them as we parse the policy XML.
+
+Co-authored-by: Pierre-Hugues Husson <phh@phh.me>
+Change-Id: I3305594a17285da113167b419543543f0ef71122
+---
+ .../managerdefinitions/src/Serializer.cpp     | 26 ++++++++++++++++---
+ 1 file changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+index f5233f2a42..6630d06f6d 100644
+--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+@@ -26,6 +26,7 @@
+ #include <libxml/xinclude.h>
+ #include <media/convert.h>
+ #include <cutils/properties.h>
+#include <system/audio.h>
+ #include <utils/Log.h>
+ #include <utils/StrongPointer.h>
+ #include <utils/Errors.h>
+@@ -334,11 +335,8 @@ status_t PolicySerializer::deserializeCollection(const xmlNode *cur,
+                             Trait::collectionTag);
+                         return status;
+                     }
+-                } else if (mIgnoreVendorExtensions && std::get<status_t>(maybeElement) == NO_INIT) {
+-                    // Skip a vendor extension element.
+-                } else {
+-                    return BAD_VALUE;
+                 }
+                // Ignore elements that failed to parse, e.g. routes with invalid sinks
+             }
+         }
+         if (!xmlStrcmp(cur->name, reinterpret_cast<const xmlChar*>(Trait::tag))) {
+@@ -679,6 +677,7 @@ std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<Modu
+         ALOGE("%s: No %s found", __func__, Attributes::name);
+         return BAD_VALUE;
+     }
+
+     uint32_t versionMajor = 0, versionMinor = 0;
+     std::string versionLiteral = getXmlAttribute(cur, Attributes::version);
+     if (!versionLiteral.empty()) {
+@@ -704,6 +703,25 @@ std::variant<status_t, ModuleTraits::Element> PolicySerializer::deserialize<Modu
+     if (status != NO_ERROR) {
+         return status;
+     }
+    bool shouldEraseA2DP = name == "primary" && property_get_bool("persist.bluetooth.system_audio_hal.enabled", false);
+    if (shouldEraseA2DP) {
+        // Having A2DP ports in the primary audio HAL module will interfere with sysbta
+        // so remove them here. Note that we do not need to explicitly remove the
+        // corresponding routes below, because routes with invalid sinks will be ignored
+        auto iter = devicePorts.begin();
+        while (iter != devicePorts.end()) {
+            auto port = *iter;
+            auto type = port->type();
+            if (type == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP
+                    || type == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES
+                    || type == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER) {
+                ALOGE("Erasing A2DP device port %s", port->getTagName().c_str());
+                iter = devicePorts.erase(iter);
+            } else {
+                iter++;
+            }
+        }
+    }
+     module->setDeclaredDevices(devicePorts);
+ 
+     RouteTraits::Collection routes;
+-- 
+2.37.2
+
--- a/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
+++ b/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
@ -0,0 +1,64 @@
+From 1891dacd48c4d502666fb4468582c088e4c0c097 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 1/3] Re-implement fnmatch-like behaviour for RRO java-side
+
+T: Also apply to FrameworkParsingPackageUtils (@PeterCxy)
+
+Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
+---
+ core/java/android/content/pm/PackageParser.java     | 13 +++++++++++--
+ .../pm/parsing/FrameworkParsingPackageUtils.java    | 13 +++++++++++--
+ 2 files changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
+index 995092117f4d..28efda00393d 100644
+--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
+@@ -2544,8 +2544,17 @@ public class PackageParser {
+         for (int i = 0; i < propNames.length; i++) {
+             // Check property value: make sure it is both set and equal to expected value
+             final String currValue = SystemProperties.get(propNames[i]);
+-            if (!TextUtils.equals(currValue, propValues[i])) {
+-                return false;
+            final String value = propValues[i];
+            if(value.startsWith("+")) {
+                final java.util.regex.Pattern regex = java.util.regex.Pattern.compile(value.substring(1, value.length()).replace("*", ".*"));
+                java.util.regex.Matcher matcher = regex.matcher(currValue);
+                if (!matcher.find()) {
+                    return false;
+                }
+            } else {
+                if(!value.equals(currValue)) {
+                    return false;
+                }
+             }
+         }
+         return true;
+diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
+index 3e1c5bb3d7ec..8182e9e0c771 100644
+--- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
+++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java
+@@ -215,8 +215,17 @@ public class FrameworkParsingPackageUtils {
+         for (int i = 0; i < propNames.length; i++) {
+             // Check property value: make sure it is both set and equal to expected value
+             final String currValue = SystemProperties.get(propNames[i]);
+-            if (!TextUtils.equals(currValue, propValues[i])) {
+-                return false;
+            final String value = propValues[i];
+            if(value.startsWith("+")) {
+                final java.util.regex.Pattern regex = java.util.regex.Pattern.compile(value.substring(1, value.length()).replace("*", ".*"));
+                java.util.regex.Matcher matcher = regex.matcher(currValue);
+                if (!matcher.find()) {
+                    return false;
+                }
+            } else {
+                if(!value.equals(currValue)) {
+                    return false;
+                }
+             }
+         }
+         return true;
+-- 
+2.25.1
+
--- a/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch
+++ b/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch
@ -0,0 +1,46 @@
+From b0333760d4370e63470fc61bece55e29f16a9eaf 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 2/3] LightsService: Alternative backlight scale
+
+Reserved a manual override just in case
+
+Change-Id: I46ae69c758d1a4609d89cf1c293488ea5fc76787
+---
+ .../com/android/server/lights/LightsService.java    | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
+index fea6b29d9260..2a9a3b63ea2e 100644
+--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
+@@ -32,6 +32,7 @@ import android.os.IBinder;
+ import android.os.Looper;
+ import android.os.RemoteException;
+ import android.os.ServiceManager;
+import android.os.SystemProperties;
+ import android.os.Trace;
+ import android.provider.Settings;
+ import android.util.Slog;
+@@ -295,6 +296,18 @@ public class LightsService extends SystemService {
+                     return;
+                 }
+                 int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness);
+                if (mHwLight.id == 0) {
+                    int scaleOverrideValue = SystemProperties.getInt("persist.sys.treble.backlight_scale.override_value", -1);
+                    if (scaleOverrideValue != -1) {
+                        setLightLocked(brightnessInt * scaleOverrideValue / 255, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
+                        return;
+                    }
+                    int scaleValue = SystemProperties.getInt("persist.sys.treble.backlight_scale.value", -1);
+                    if (scaleValue != -1) {
+                        setLightLocked(brightnessInt * scaleValue / 255, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
+                        return;
+                    }
+                }
+                 int color = brightnessInt & 0x000000ff;
+                 color = 0xff000000 | (color << 16) | (color << 8) | color;
+                 setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
+-- 
+2.25.1
+
--- a/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch
+++ b/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch
@ -0,0 +1,127 @@
+From f962ed979393abb8297e790b452739a8eec9c76c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 15 Oct 2022 09:33:56 +0000
+Subject: [PATCH 3/3] Revert "Remove more FDE methods from StorageManager"
+
+This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676.
+---
+ .../android/os/storage/StorageManager.java    | 69 ++++++++++++++++---
+ .../internal/os/RoSystemProperties.java       |  4 ++
+ 2 files changed, 65 insertions(+), 8 deletions(-)
+
+diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
+index 497bfa6380bc..646a7095c1b3 100644
+--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
+@@ -1681,13 +1681,18 @@ public class StorageManager {
+     }
+ 
+     /** {@hide}
+-     * Is this device encrypted?
+-     * <p>
+-     * Note: all devices launching with Android 10 (API level 29) or later are
+-     * required to be encrypted.  This should only ever return false for
+-     * in-development devices on which encryption has not yet been configured.
+-     *
+-     * @return true if encrypted, false if not encrypted
+     * Is this device encryptable or already encrypted?
+     * @return true for encryptable or encrypted
+     *         false not encrypted and not encryptable
+     */
+    public static boolean isEncryptable() {
+        return RoSystemProperties.CRYPTO_ENCRYPTABLE;
+    }
+
+    /** {@hide}
+     * Is this device already encrypted?
+     * @return true for encrypted. (Implies isEncryptable() == true)
+     *         false not encrypted
+      */
+     public static boolean isEncrypted() {
+         return RoSystemProperties.CRYPTO_ENCRYPTED;
+@@ -1696,7 +1701,7 @@ public class StorageManager {
+     /** {@hide}
+      * Is this device file encrypted?
+      * @return true for file encrypted. (Implies isEncrypted() == true)
+-     *         false not encrypted or using "managed" encryption
+     *         false not encrypted or block encrypted
+      */
+     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
+     public static boolean isFileEncryptedNativeOnly() {
+@@ -1706,6 +1711,54 @@ public class StorageManager {
+         return RoSystemProperties.CRYPTO_FILE_ENCRYPTED;
+     }
+ 
+    /** {@hide}
+     * Is this device block encrypted?
+     * @return true for block encrypted. (Implies isEncrypted() == true)
+     *         false not encrypted or file encrypted
+     */
+    public static boolean isBlockEncrypted() {
+        return false;
+    }
+
+    /** {@hide}
+     * Is this device block encrypted with credentials?
+     * @return true for crediential block encrypted.
+     *         (Implies isBlockEncrypted() == true)
+     *         false not encrypted, file encrypted or default block encrypted
+     */
+    public static boolean isNonDefaultBlockEncrypted() {
+        return false;
+    }
+
+    /** {@hide}
+     * Is this device in the process of being block encrypted?
+     * @return true for encrypting.
+     *         false otherwise
+     * Whether device isEncrypted at this point is undefined
+     * Note that only system services and CryptKeeper will ever see this return
+     * true - no app will ever be launched in this state.
+     * Also note that this state will not change without a teardown of the
+     * framework, so no service needs to check for changes during their lifespan
+     */
+    public static boolean isBlockEncrypting() {
+        return false;
+    }
+
+    /** {@hide}
+     * Is this device non default block encrypted and in the process of
+     * prompting for credentials?
+     * @return true for prompting for credentials.
+     *         (Implies isNonDefaultBlockEncrypted() == true)
+     *         false otherwise
+     * Note that only system services and CryptKeeper will ever see this return
+     * true - no app will ever be launched in this state.
+     * Also note that this state will not change without a teardown of the
+     * framework, so no service needs to check for changes during their lifespan
+     */
+    public static boolean inCryptKeeperBounce() {
+        return false;
+    }
+
+     /** {@hide} */
+     public static boolean isFileEncryptedEmulatedOnly() {
+         return SystemProperties.getBoolean(StorageManager.PROP_EMULATE_FBE, false);
+diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java
+index 98d81c9598b8..8b659f927633 100644
+--- a/core/java/com/android/internal/os/RoSystemProperties.java
+++ b/core/java/com/android/internal/os/RoSystemProperties.java
+@@ -60,10 +60,14 @@ public class RoSystemProperties {
+     public static final CryptoProperties.type_values CRYPTO_TYPE =
+             CryptoProperties.type().orElse(CryptoProperties.type_values.NONE);
+     // These are pseudo-properties
+    public static final boolean CRYPTO_ENCRYPTABLE =
+            CRYPTO_STATE != CryptoProperties.state_values.UNSUPPORTED;
+     public static final boolean CRYPTO_ENCRYPTED =
+             CRYPTO_STATE == CryptoProperties.state_values.ENCRYPTED;
+     public static final boolean CRYPTO_FILE_ENCRYPTED =
+             CRYPTO_TYPE == CryptoProperties.type_values.FILE;
+    public static final boolean CRYPTO_BLOCK_ENCRYPTED =
+            CRYPTO_TYPE == CryptoProperties.type_values.BLOCK;
+ 
+     public static final boolean CONTROL_PRIVAPP_PERMISSIONS_LOG =
+             "log".equalsIgnoreCase(CONTROL_PRIVAPP_PERMISSIONS);
+-- 
+2.25.1
+
--- a/patches_treble/frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
+++ b/patches_treble/frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch
@ -0,0 +1,33 @@
+From 2bb0d801335970b8f0e9b8b7ffdf86128ae19468 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Sun, 14 Nov 2021 13:47:29 -0500
+Subject: [PATCH] Pie MTK IMS calls static
+ ImsManager.updateImsServiceConfig(Context,int,boolean). Bring it back
+
+Change-Id: I3dd66d436629d37c8ec795df6569736195ae570e
+---
+ src/java/com/android/ims/ImsManager.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
+index c41426d..2c6d656 100644
+--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
+@@ -1667,6 +1667,14 @@ public class ImsManager implements FeatureUpdates {
+         }
+     }
+ 
+    public static void updateImsServiceConfig(Context context, int phoneId, boolean force) {
+        ImsManager mgr = ImsManager.getInstance(context, phoneId);
+        if (mgr != null) {
+            mgr.updateImsServiceConfig();
+        }
+        Rlog.e(TAG, "updateImsServiceConfig: ImsManager null, returning without update.");
+    }
+
+     /**
+      * Push configuration updates to the ImsService implementation.
+      */
+-- 
+2.25.1
+
--- a/patches_treble/frameworks_opt_telephony/0001-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
+++ b/patches_treble/frameworks_opt_telephony/0001-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
@ -0,0 +1,47 @@
+From fc4ecc73093f88934a65a9371ae7af274c2b143d Mon Sep 17 00:00:00 2001
+From: ironydelerium <42721860+ironydelerium@users.noreply.github.com>
+Date: Fri, 31 Dec 2021 02:20:28 -0800
+Subject: [PATCH] Reintroduce 'public void
+ TelephonyMetrics.writeRilSendSms(int, int, int, int)'. (#8)
+
+The MediaTek IMS package for Android Q, at the very least (likely for the rest, too)
+invoke this method in their `sendSms` method; Google, in their infinite wisdom,
+decided that this method needed a message ID passed in as well, changing the signature
+to 'public void TelephonyMetrics.writeRilSendSms(int, int, int, int, long)' and resulting
+in a MethodNotFoundException being raised in com.mediatek.ims, crashing it.
+
+Fixes https://github.com/phhusson/treble_experimentations/issues/2125.
+
+Co-authored-by: Sarah Vandomelen <sarah@sightworks.com>
+Change-Id: I789f470fb38d86dd37e8408536e208a7a49e7e26
+---
+ .../telephony/metrics/TelephonyMetrics.java         | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
+index 5b47ae5b7a..f3e7717aca 100644
+--- a/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
+++ b/src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java
+@@ -2324,6 +2324,19 @@ public class TelephonyMetrics {
+         smsSession.increaseExpectedResponse();
+     }
+ 
+    /**
+     * Write Send SMS event (backwards-compatible method for R and earlier IMS implementations)
+     *
+     * @param phoneId Phone id
+     * @param rilSerial RIL request serial number
+     * @param tech SMS RAT
+     * @param format SMS format. Either {@link SmsMessage#FORMAT_3GPP} or
+     *         {@link SmsMessage#FORMAT_3GPP2}.
+     */
+    public void writeRilSendSms(int phoneId, int rilSerial, int tech, int format) {
+        writeRilSendSms(phoneId, rilSerial, tech, format, 0);
+    }
+
+     /**
+      * Write Send SMS event using ImsService. Expecting response from
+      * {@link #writeOnSmsSolicitedResponse}.
+-- 
+2.25.1
+
--- a/patches_treble/frameworks_proto_logging/0001-Add-an-enum-for-Treble-settings.patch
+++ b/patches_treble/frameworks_proto_logging/0001-Add-an-enum-for-Treble-settings.patch
@ -0,0 +1,27 @@
+From 25edd8e7b0afd85ea1bc6f39878b557c47366518 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Fri, 30 Sep 2022 11:32:24 +0000
+Subject: [PATCH] Add an enum for Treble settings
+
+Change-Id: I8dc25afa27e938ee82594a8343e73c7c494003e2
+---
+ stats/enums/app/settings_enums.proto | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/stats/enums/app/settings_enums.proto b/stats/enums/app/settings_enums.proto
+index ed241b6c..41b5efe0 100644
+--- a/stats/enums/app/settings_enums.proto
+++ b/stats/enums/app/settings_enums.proto
+@@ -2006,6 +2006,9 @@ enum PageId {
+     // OPEN: Settings > System > Input & Gesture > Double twist gesture
+     SETTINGS_GESTURE_DOUBLE_TWIST = 755;
+ 
+    // OPEN: Settings > Treble Settings
+    SETTINGS_TREBLE_CATEGORY = 777;
+
+     // OPEN: Settings > Apps > Default Apps > Default browser
+     DEFAULT_BROWSER_PICKER = 785;
+     // OPEN: Settings > Apps > Default Apps > Default emergency app
+-- 
+2.25.1
+
--- a/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch
+++ b/patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch
@ -0,0 +1,356 @@
+From 4ecdcc515e80750e3423a5c203048b76aae0809c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Thu, 22 Sep 2022 12:37:50 +0000
+Subject: [PATCH 1/3] TrebleSettings: Screen resolution & refresh rate
+
+Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec
+---
+ AndroidManifest.xml                           |   8 +
+ res/drawable/ic_settings_treble.xml           |  10 ++
+ res/values/menu_keys.xml                      |   1 +
+ res/values/strings.xml                        |  10 ++
+ res/xml/top_level_settings.xml                |   9 +
+ res/xml/treble_settings.xml                   |  18 ++
+ ...lutionRefreshRatePreferenceController.java | 169 ++++++++++++++++++
+ .../settings/treble/TrebleSettings.java       |  39 ++++
+ 8 files changed, 264 insertions(+)
+ create mode 100644 res/drawable/ic_settings_treble.xml
+ create mode 100644 res/xml/treble_settings.xml
+ create mode 100644 src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
+ create mode 100644 src/com/android/settings/treble/TrebleSettings.java
+
+diff --git a/AndroidManifest.xml b/AndroidManifest.xml
+index d800bb472e..1495e851a7 100644
+--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
+@@ -220,6 +220,14 @@
+                 android:value="com.android.settings.shortcut.CreateShortcut" />
+         </activity>
+ 
+        <receiver
+            android:name=".treble.ScreenResolutionRefreshRatePreferenceController$BootReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+
+         <!-- Wireless Controls -->
+         <activity
+             android:name=".Settings$NetworkDashboardActivity"
+diff --git a/res/drawable/ic_settings_treble.xml b/res/drawable/ic_settings_treble.xml
+new file mode 100644
+index 0000000000..3c56ed7032
+--- /dev/null
+++ b/res/drawable/ic_settings_treble.xml
+@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10.82 12.49c.02-.16.04-.32.04-.49 0-.17-.02-.33-.04-.49l1.08-.82c.1-.07.12-.21.06-.32l-1.03-1.73c-.06-.11-.2-.15-.31-.11l-1.28.5c-.27-.2-.56-.36-.87-.49l-.2-1.33c0-.12-.11-.21-.24-.21H5.98c-.13 0-.24.09-.26.21l-.2 1.32c-.31.12-.6.3-.87.49l-1.28-.5c-.12-.05-.25 0-.31.11l-1.03 1.73c-.06.12-.03.25.07.33l1.08.82c-.02.16-.03.33-.03.49 0 .17.02.33.04.49l-1.09.83c-.1.07-.12.21-.06.32l1.03 1.73c.06.11.2.15.31.11l1.28-.5c.27.2.56.36.87.49l.2 1.32c.01.12.12.21.25.21h2.06c.13 0 .24-.09.25-.21l.2-1.32c.31-.12.6-.3.87-.49l1.28.5c.12.05.25 0 .31-.11l1.03-1.73c.06-.11.04-.24-.06-.32l-1.1-.83zM7 13.75c-.99 0-1.8-.78-1.8-1.75s.81-1.75 1.8-1.75 1.8.78 1.8 1.75S8 13.75 7 13.75zM18 1.01L8 1c-1.1 0-2 .9-2 2v3h2V5h10v14H8v-1H6v3c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2V3c0-1.1-.9-1.99-2-1.99z"/>
+</vector>
+diff --git a/res/values/menu_keys.xml b/res/values/menu_keys.xml
+index 2841b699c9..c30d6392e9 100755
+--- a/res/values/menu_keys.xml
+++ b/res/values/menu_keys.xml
+@@ -16,6 +16,7 @@
+ 
+ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ 
+    <string name="menu_key_treble" translatable="false">top_level_treble</string>
+     <string name="menu_key_network" translatable="false">top_level_network</string>
+     <string name="menu_key_connected_devices" translatable="false">top_level_connected_devices</string>
+     <string name="menu_key_apps" translatable="false">top_level_apps</string>
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 04b2de208b..8cebfe3964 100644
+--- a/res/values/strings.xml
+++ b/res/values/strings.xml
+@@ -8274,6 +8274,16 @@
+         <item quantity="other">Show %d hidden items</item>
+     </plurals>
+ 
+    <!-- Title for setting tile leading to Treble settings [CHAR LIMIT=40]-->
+    <string name="treble_settings">Treble settings</string>
+    <!-- Summary for Treble settings [CHAR LIMIT=NONE]-->
+    <string name="treble_settings_summary">Fixes &amp; tweaks for GSIs</string>
+    <!-- Display category name [CHAR LIMIT=none] -->
+    <string name="treble_settings_category_name_display">Display</string>
+
+    <!-- Treble settings screen, screen resolution and refresh rate settings title -->
+    <string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
+
+     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
+     <string name="network_dashboard_title">Network &amp; internet</string>
+     <!-- Summary for Network and Internet settings, explaining it contains mobile, wifi setting and data usage settings [CHAR LIMIT=NONE]-->
+diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
+index c9e60170eb..1127056675 100644
+--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
+@@ -20,6 +20,15 @@
+     xmlns:settings="http://schemas.android.com/apk/res-auto"
+     android:key="top_level_settings">
+ 
+    <com.android.settings.widget.HomepagePreference
+        android:fragment="com.android.settings.treble.TrebleSettings"
+        android:icon="@drawable/ic_settings_treble"
+        android:key="top_level_treble"
+        android:order="-160"
+        android:title="@string/treble_settings"
+        android:summary="@string/treble_settings_summary"
+        settings:highlightableMenuKey="@string/menu_key_treble"/>
+
+     <com.android.settings.widget.HomepagePreference
+         android:fragment="com.android.settings.network.NetworkDashboardFragment"
+         android:icon="@drawable/ic_settings_wireless"
+diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
+new file mode 100644
+index 0000000000..1a82c468a2
+--- /dev/null
+++ b/res/xml/treble_settings.xml
+@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="treble_settings_screen"
+    android:title="@string/treble_settings">
+
+    <PreferenceCategory
+        android:title="@string/treble_settings_category_name_display">
+
+        <ListPreference
+            android:key="screen_resolution_refresh_rate"
+            android:title="@string/screen_resolution_refresh_rate_title" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+diff --git a/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
+new file mode 100644
+index 0000000000..5d14f13209
+--- /dev/null
+++ b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
+@@ -0,0 +1,169 @@
+package com.android.settings.treble;
+
+import static android.content.Intent.ACTION_BOOT_COMPLETED;
+
+import android.app.ActivityManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.view.SurfaceControl;
+import android.view.SurfaceControl.DisplayMode;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ScreenResolutionRefreshRatePreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String SCREEN_RESOLUTION_REFRESH_RATE_KEY = "screen_resolution_refresh_rate";
+    private static final String SURFACE_FLINGER_SERVICE_KEY = "SurfaceFlinger";
+    private static final String SURFACE_COMPOSER_INTERFACE_KEY = "android.ui.ISurfaceComposer";
+    private static final int SURFACE_FLINGER_CODE = 1035;
+    private static final String TREBLE_DISPLAY_MODE_PROPERTY = "persist.sys.treble.display_mode";
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+
+    private ActivityManager mAm;
+    private ListPreference mListPreference;
+    private List<DisplayMode> mModes = new ArrayList<>();
+    private List<String> mEntries = new ArrayList<>();
+    private List<String> mValues = new ArrayList<>();
+
+    public ScreenResolutionRefreshRatePreferenceController(Context context) {
+        super(context, SCREEN_RESOLUTION_REFRESH_RATE_KEY);
+
+        mAm = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+
+        DisplayMode[] supportedDisplayModes =
+                SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).supportedDisplayModes;
+        Set<String> summarySet = new HashSet<>();
+        for (DisplayMode m : supportedDisplayModes) {
+            String summary = String.format("%dx%d @ %dHz", m.width, m.height, Math.round(m.refreshRate));
+            if (!summarySet.contains(summary)) {
+                summarySet.add(summary);
+                mModes.add(m);
+            }
+        }
+        Collections.sort(mModes, Comparator.comparing((DisplayMode m)->m.width)
+                .thenComparing(m->m.height)
+                .thenComparing(m->m.refreshRate)
+                .thenComparing(m->m.id));
+        for (DisplayMode m : mModes) {
+            String summary = String.format("%dx%d @ %dHz", m.width, m.height, Math.round(m.refreshRate));
+            mEntries.add(summary);
+            mValues.add(String.valueOf(m.id));
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SCREEN_RESOLUTION_REFRESH_RATE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mListPreference = screen.findPreference(getPreferenceKey());
+        mListPreference.setEntries(mEntries.toArray(new String[mEntries.size()]));
+        mListPreference.setEntryValues(mValues.toArray(new String[mValues.size()]));
+
+        if (mEntries.size() <= 1) {
+            mListPreference.setEnabled(false);
+        }
+
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        int id = SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).activeDisplayModeId;
+        int index = mListPreference.findIndexOfValue(String.valueOf(id));
+        mListPreference.setValueIndex(index);
+        mListPreference.setSummary(mListPreference.getEntries()[index]);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        DisplayMode currentMode = getCurrentMode();
+        int id = Integer.valueOf((String) newValue);
+        DisplayMode newMode = getModeById(id);
+        setModeFromBackdoor(id);
+        SystemProperties.set(TREBLE_DISPLAY_MODE_PROPERTY, (String) newValue);
+        int index = mListPreference.findIndexOfValue((String) newValue);
+        mListPreference.setValueIndex(index);
+        mListPreference.setSummary(mListPreference.getEntries()[index]);
+        if ((newMode.width != currentMode.width) || (newMode.height != currentMode.height)) {
+            try {
+                for (ActivityManager.RunningAppProcessInfo app: mAm.getRunningAppProcesses()) {
+                    if (app.processName.equals(SYSTEMUI_PACKAGE_NAME)) {
+                        ActivityManager.getService().killApplicationProcess(app.processName, app.uid);
+                        break;
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    private DisplayMode getCurrentMode() {
+        int id = SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).activeDisplayModeId;
+        return getModeById(id);
+    }
+
+    private DisplayMode getModeById(int id) {
+        for (DisplayMode m : mModes) {
+            if (m.id == id) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    public static void setModeFromBackdoor(int id) {
+        IBinder surfaceFlinger = ServiceManager.getService(SURFACE_FLINGER_SERVICE_KEY);
+        try {
+            if (surfaceFlinger != null) {
+                Parcel data = Parcel.obtain();
+                data.writeInterfaceToken(SURFACE_COMPOSER_INTERFACE_KEY);
+                data.writeInt(id);
+                surfaceFlinger.transact(SURFACE_FLINGER_CODE, data, null, 0);
+                data.recycle();
+            }
+        } catch (RemoteException ex) {}
+    }
+
+    public static class BootReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+                int id = SystemProperties.getInt(TREBLE_DISPLAY_MODE_PROPERTY, -1);
+                if (id != -1) {
+                    setModeFromBackdoor(id);
+                }
+            }
+        }
+
+    }
+
+}
+diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
+new file mode 100644
+index 0000000000..e581539229
+--- /dev/null
+++ b/src/com/android/settings/treble/TrebleSettings.java
+@@ -0,0 +1,39 @@
+package com.android.settings.treble;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TrebleSettings extends DashboardFragment {
+
+    private static final String TAG = "TrebleSettings";
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.treble_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_TREBLE_CATEGORY;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
+        return controllers;
+    }
+
+}
+-- 
+2.25.1
+
--- a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch
+++ b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch
@ -0,0 +1,288 @@
+From 937c56865ea02e00886920f40cabd85ab293a5fb Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 24 Sep 2022 03:38:41 +0000
+Subject: [PATCH 2/3] TrebleSettings: Basic audio and display fixes
+
+- Alternative audio policy
+- Disable soundvolume effect
+- Alternative backlight scale
+
+Change-Id: I4f22dcd9c59c40b3fd70ba642db35b9466467b7d
+---
+ res/values/strings.xml                        |  8 +++
+ res/xml/treble_settings.xml                   | 17 ++++++
+ ...SoundvolumeEffectPreferenceController.java | 59 +++++++++++++++++++
+ .../settings/treble/TrebleSettings.java       |  3 +
+ ...nativeAudioPolicyPreferenceController.java | 59 +++++++++++++++++++
+ ...iveBacklightScalePreferenceController.java | 53 +++++++++++++++++
+ 6 files changed, 199 insertions(+)
+ create mode 100644 src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java
+ create mode 100644 src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java
+ create mode 100644 src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java
+
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 8cebfe3964..4014c53eaa 100644
+--- a/res/values/strings.xml
+++ b/res/values/strings.xml
+@@ -8278,11 +8278,19 @@
+     <string name="treble_settings">Treble settings</string>
+     <!-- Summary for Treble settings [CHAR LIMIT=NONE]-->
+     <string name="treble_settings_summary">Fixes &amp; tweaks for GSIs</string>
+    <!-- Audio category name [CHAR LIMIT=none] -->
+    <string name="treble_settings_category_name_audio">Audio</string>
+     <!-- Display category name [CHAR LIMIT=none] -->
+     <string name="treble_settings_category_name_display">Display</string>
+ 
+    <!-- Treble settings screen, use alternative audio policy title -->
+    <string name="use_alternative_audio_policy_title">Use alternative audio policy</string>
+    <!-- Treble settings screen, disable soundvolume effect title -->
+    <string name="disable_soundvolume_effect_title">Disable soundvolume effect</string>
+     <!-- Treble settings screen, screen resolution and refresh rate settings title -->
+     <string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
+    <!-- Treble settings screen, use alternative backlight scale title -->
+    <string name="use_alternative_backlight_scale_title">Use alternative backlight scale</string>
+ 
+     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
+     <string name="network_dashboard_title">Network &amp; internet</string>
+diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
+index 1a82c468a2..336137c95f 100644
+--- a/res/xml/treble_settings.xml
+++ b/res/xml/treble_settings.xml
+@@ -6,6 +6,19 @@
+     android:key="treble_settings_screen"
+     android:title="@string/treble_settings">
+ 
+    <PreferenceCategory
+        android:title="@string/treble_settings_category_name_audio">
+
+        <SwitchPreference
+            android:key="use_alternative_audio_policy"
+            android:title="@string/use_alternative_audio_policy_title" />
+
+        <SwitchPreference
+            android:key="disable_soundvolume_effect"
+            android:title="@string/disable_soundvolume_effect_title" />
+
+    </PreferenceCategory>
+
+     <PreferenceCategory
+         android:title="@string/treble_settings_category_name_display">
+ 
+@@ -13,6 +26,10 @@
+             android:key="screen_resolution_refresh_rate"
+             android:title="@string/screen_resolution_refresh_rate_title" />
+ 
+        <SwitchPreference
+            android:key="use_alternative_backlight_scale"
+            android:title="@string/use_alternative_backlight_scale_title" />
+
+     </PreferenceCategory>
+ 
+ </PreferenceScreen>
+diff --git a/src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java b/src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java
+new file mode 100644
+index 0000000000..8feb318f55
+--- /dev/null
+++ b/src/com/android/settings/treble/DisableSoundvolumeEffectPreferenceController.java
+@@ -0,0 +1,59 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class DisableSoundvolumeEffectPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String DISABLE_SOUNDVOLUME_EFFECT_KEY = "disable_soundvolume_effect";
+    private static final String RO_HARDWARE_PROPERTY = "ro.hardware";
+    private static final String TREBLE_CAF_DISABLE_SOUNDVOLUME_EFFECT_PROPERTY = "persist.sys.treble.caf.disable_soundvolume_effect";
+
+    private SwitchPreference mSwitchPreference;
+
+    public DisableSoundvolumeEffectPreferenceController(Context context) {
+        super(context, DISABLE_SOUNDVOLUME_EFFECT_KEY);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DISABLE_SOUNDVOLUME_EFFECT_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mSwitchPreference = screen.findPreference(getPreferenceKey());
+
+        if (!SystemProperties.get(RO_HARDWARE_PROPERTY, "N/A").equals("qcom")) {
+            mSwitchPreference.setEnabled(false);
+        }
+
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        boolean checked = SystemProperties.getBoolean(TREBLE_CAF_DISABLE_SOUNDVOLUME_EFFECT_PROPERTY, false);
+        mSwitchPreference.setChecked(checked);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        SystemProperties.set(TREBLE_CAF_DISABLE_SOUNDVOLUME_EFFECT_PROPERTY, String.valueOf((boolean) newValue));
+        mSwitchPreference.setChecked((boolean) newValue);
+        return true;
+    }
+
+}
+diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
+index e581539229..5c1611c053 100644
+--- a/src/com/android/settings/treble/TrebleSettings.java
+++ b/src/com/android/settings/treble/TrebleSettings.java
+@@ -32,7 +32,10 @@ public class TrebleSettings extends DashboardFragment {
+     @Override
+     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+         final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new UseAlternativeAudioPolicyPreferenceController(context));
+        controllers.add(new DisableSoundvolumeEffectPreferenceController(context));
+         controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
+        controllers.add(new UseAlternativeBacklightScalePreferenceController(context));
+         return controllers;
+     }
+ 
+diff --git a/src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java b/src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java
+new file mode 100644
+index 0000000000..fbc327cba0
+--- /dev/null
+++ b/src/com/android/settings/treble/UseAlternativeAudioPolicyPreferenceController.java
+@@ -0,0 +1,59 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class UseAlternativeAudioPolicyPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String USE_ALTERNATIVE_AUDIO_POLICY_KEY = "use_alternative_audio_policy";
+    private static final String RO_HARDWARE_PROPERTY = "ro.hardware";
+    private static final String TREBLE_CAF_AUDIO_POLICY_PROPERTY = "persist.sys.treble.caf.audio_policy";
+
+    private SwitchPreference mSwitchPreference;
+
+    public UseAlternativeAudioPolicyPreferenceController(Context context) {
+        super(context, USE_ALTERNATIVE_AUDIO_POLICY_KEY);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return USE_ALTERNATIVE_AUDIO_POLICY_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mSwitchPreference = screen.findPreference(getPreferenceKey());
+
+        if (!SystemProperties.get(RO_HARDWARE_PROPERTY, "N/A").equals("qcom")) {
+            mSwitchPreference.setEnabled(false);
+        }
+
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        boolean checked = SystemProperties.getBoolean(TREBLE_CAF_AUDIO_POLICY_PROPERTY, false);
+        mSwitchPreference.setChecked(checked);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        SystemProperties.set(TREBLE_CAF_AUDIO_POLICY_PROPERTY, String.valueOf((boolean) newValue));
+        mSwitchPreference.setChecked((boolean) newValue);
+        return true;
+    }
+
+}
+diff --git a/src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java b/src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java
+new file mode 100644
+index 0000000000..bd9de82d90
+--- /dev/null
+++ b/src/com/android/settings/treble/UseAlternativeBacklightScalePreferenceController.java
+@@ -0,0 +1,53 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class UseAlternativeBacklightScalePreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String USE_ALTERNATIVE_BACKLIGHT_SCALE_KEY = "use_alternative_backlight_scale";
+    private static final String TREBLE_BACKLIGHT_SCALE_PROPERTY = "persist.sys.treble.backlight_scale";
+
+    private SwitchPreference mSwitchPreference;
+
+    public UseAlternativeBacklightScalePreferenceController(Context context) {
+        super(context, USE_ALTERNATIVE_BACKLIGHT_SCALE_KEY);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return USE_ALTERNATIVE_BACKLIGHT_SCALE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mSwitchPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        boolean checked = SystemProperties.getBoolean(TREBLE_BACKLIGHT_SCALE_PROPERTY, false);
+        mSwitchPreference.setChecked(checked);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        SystemProperties.set(TREBLE_BACKLIGHT_SCALE_PROPERTY, String.valueOf((boolean) newValue));
+        mSwitchPreference.setChecked((boolean) newValue);
+        return true;
+    }
+
+}
+-- 
+2.25.1
+
--- a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch
+++ b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch
@ -0,0 +1,363 @@
+From 106235d2d4f2e0540a0a73332cfecf465942e9cc Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 11 Oct 2022 10:29:36 +0000
+Subject: [PATCH 3/3] TrebleSettings: IMS
+
+Change-Id: Id7a12e150d4a3dc988f8ce1a888ad88443fa0ea4
+---
+ Android.bp                                    |   1 +
+ res/values/strings.xml                        |   9 +
+ res/xml/treble_settings.xml                   |  13 ++
+ .../InstallImsApkPreferenceController.java    | 198 ++++++++++++++++++
+ ...VolteAvailabilityPreferenceController.java |  59 ++++++
+ .../settings/treble/TrebleSettings.java       |   2 +
+ 6 files changed, 282 insertions(+)
+ create mode 100644 src/com/android/settings/treble/InstallImsApkPreferenceController.java
+ create mode 100644 src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
+
+diff --git a/Android.bp b/Android.bp
+index 140d4480c8..c73a774a28 100644
+--- a/Android.bp
+++ b/Android.bp
+@@ -81,6 +81,7 @@ android_library {
+         "LineagePreferenceLib",
+         "vendor.lineage.fastcharge-V1.0-java",
+         "SystemUISharedLib",
+        "android.hidl.manager-V1.0-java",
+     ],
+ 
+     libs: [
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 4014c53eaa..ef8ffbbf46 100644
+--- a/res/values/strings.xml
+++ b/res/values/strings.xml
+@@ -8282,6 +8282,8 @@
+     <string name="treble_settings_category_name_audio">Audio</string>
+     <!-- Display category name [CHAR LIMIT=none] -->
+     <string name="treble_settings_category_name_display">Display</string>
+    <!-- IMS category name [CHAR LIMIT=none] -->
+    <string name="treble_settings_category_name_ims">IMS</string>
+ 
+     <!-- Treble settings screen, use alternative audio policy title -->
+     <string name="use_alternative_audio_policy_title">Use alternative audio policy</string>
+@@ -8291,6 +8293,13 @@
+     <string name="screen_resolution_refresh_rate_title">Screen resolution &amp; refresh rate</string>
+     <!-- Treble settings screen, use alternative backlight scale title -->
+     <string name="use_alternative_backlight_scale_title">Use alternative backlight scale</string>
+    <!-- Treble settings screen, install IMS APK title -->
+    <string name="install_ims_apk_title">Install IMS APK</string>
+    <!-- Treble settings screen, install IMS APK toasts -->
+    <string name="install_ims_apk_toast_downloading">Downloading IMS APK...</string>
+    <string name="install_ims_apk_toast_completed">IMS APK installed. Reboot required.</string>
+    <!-- Treble settings screen, override VoLTE availability title -->
+    <string name="override_volte_availability_title">Override VoLTE availability</string>
+ 
+     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
+     <string name="network_dashboard_title">Network &amp; internet</string>
+diff --git a/res/xml/treble_settings.xml b/res/xml/treble_settings.xml
+index 336137c95f..09e6bc5d00 100644
+--- a/res/xml/treble_settings.xml
+++ b/res/xml/treble_settings.xml
+@@ -32,4 +32,17 @@
+ 
+     </PreferenceCategory>
+ 
+    <PreferenceCategory
+        android:title="@string/treble_settings_category_name_ims">
+
+        <Preference
+            android:key="install_ims_apk"
+            android:title="@string/install_ims_apk_title" />
+
+        <SwitchPreference
+            android:key="override_volte_availability"
+            android:title="@string/override_volte_availability_title" />
+
+    </PreferenceCategory>
+
+ </PreferenceScreen>
+diff --git a/src/com/android/settings/treble/InstallImsApkPreferenceController.java b/src/com/android/settings/treble/InstallImsApkPreferenceController.java
+new file mode 100644
+index 0000000000..f59e5d7d9a
+--- /dev/null
+++ b/src/com/android/settings/treble/InstallImsApkPreferenceController.java
+@@ -0,0 +1,198 @@
+package com.android.settings.treble;
+
+import android.app.DownloadManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller;
+import android.database.Cursor;
+import android.hidl.manager.V1_0.IServiceManager;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class InstallImsApkPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceClickListener {
+
+    private static final String TAG = "TrebleSettings";
+    private static final String INSTALL_IMS_APK_KEY = "install_ims_apk";
+    private static final String[] IMS_SLOTS = {
+        "imsrild1", "imsrild2", "imsrild3",
+        "slot1", "slot2", "slot3",
+        "imsSlot1", "imsSlot2",
+        "mtkSlot1", "mtkSlot2",
+        "imsradio0", "imsradio1"
+    };
+    private static final String RO_PRODUCT_VENDOR_BRAND_PROPERTY = "ro.product.vendor.brand";
+
+    private Preference mPreference;
+    private String mImsType = "none";
+    private String mImsApkUrl = "";
+
+    public InstallImsApkPreferenceController(Context context) {
+        super(context, INSTALL_IMS_APK_KEY);
+
+        mImsType = getImsType();
+        Log.d(TAG, "IMS type = " + mImsType);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return INSTALL_IMS_APK_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mPreference = screen.findPreference(getPreferenceKey());
+
+        if (mImsType.equals("none")) {
+            mPreference.setEnabled(false);
+        } else {
+            mPreference.setOnPreferenceClickListener(this);
+        }
+
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        switch (mImsType) {
+            case "qcom_hidl_moto":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-caf-moto.apk";
+                break;
+            case "qcom_hidl":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-q.64.apk";
+                break;
+            case "qcom_aidl":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-caf-s.apk";
+                break;
+            case "mtk_p":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-p.apk";
+                break;
+            case "mtk_q":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-q.apk";
+                break;
+            case "mtk_r":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-r.apk";
+                break;
+            case "mtk_s":
+                mImsApkUrl = "https://treble.phh.me/stable/ims-mtk-s.apk";
+                break;
+            default:
+                break;
+        }
+
+        Context context = preference.getContext();
+        DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(mImsApkUrl));
+        request.setTitle("IMS APK");
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+        request.setDestinationInExternalFilesDir(context, Environment.DIRECTORY_DOWNLOADS, "ims.apk");
+        long id = dm.enqueue(request);
+        Toast.makeText(context, context.getString(R.string.install_ims_apk_toast_downloading), Toast.LENGTH_LONG).show();
+
+        context.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1L) != id) {
+                    return;
+                }
+                Cursor cursor = dm.query(new DownloadManager.Query().setFilterById(id));
+                if (!cursor.moveToFirst()) {
+                    return;
+                }
+                Uri localUri = Uri.parse(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)));
+                String path = localUri.getPath();
+                if (path == null) {
+                    return;
+                }
+                long fileSize = 0;
+                File file = new File(path);
+                if (file.isFile()) {
+                    fileSize = file.length();
+                } else {
+                    return;
+                }
+
+                try (InputStream in = new FileInputStream(path)) {
+                    PackageInstaller pi = context.getPackageManager().getPackageInstaller();
+                    int sessionId = pi.createSession(new PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL));
+                    PackageInstaller.Session session = pi.openSession(sessionId);
+                    try (OutputStream out = session.openWrite(TAG, 0, fileSize)) {
+                        byte[] buffer = new byte[512 * 1024];
+                        while (in.available() > 0) {
+                            int l = in.read(buffer);
+                            out.write(buffer, 0, l);
+                        }
+                        session.fsync(out);
+                    }
+                    String action = TAG + "_" + sessionId;
+                    PendingIntent pendingIntent = PendingIntent.getBroadcast(context, sessionId,
+                            new Intent(action), PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
+                    context.registerReceiver(new BroadcastReceiver() {
+                        @Override
+                        public void onReceive(Context context, Intent intent) {
+                            Toast.makeText(context, context.getString(R.string.install_ims_apk_toast_completed), Toast.LENGTH_LONG).show();
+                        }
+                    }, new IntentFilter(action));
+                    session.commit(pendingIntent.getIntentSender());
+                    context.unregisterReceiver(this);
+                } catch (IOException ex) {
+                    Log.d(TAG, "IOException while installing IMS APK");
+                }
+            }
+        }, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+
+        return false;
+    }
+
+    protected static String getImsType() {
+        try {
+            IServiceManager hidlManager = IServiceManager.getService();
+            for (String slot: IMS_SLOTS) {
+                if (hidlManager.get("vendor.qti.hardware.radio.ims@1.0::IImsRadio", slot) != null) {
+                    if (SystemProperties.get(RO_PRODUCT_VENDOR_BRAND_PROPERTY, "N/A").equals("motorola")) {
+                        return "qcom_hidl_moto";
+                    }
+                    return "qcom_hidl";
+                } else if (ServiceManager.getService("vendor.qti.hardware.radio.ims.IImsRadio/" + slot) != null) {
+                    return "qcom_aidl";
+                } else if (hidlManager.get("vendor.mediatek.hardware.radio@3.0::IRadio", slot) != null) {
+                    return "mtk_p";
+                } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@1.0::IMtkRadioEx", slot) != null) {
+                    return "mtk_q";
+                } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@2.0::IMtkRadioEx", slot) != null) {
+                    return "mtk_r";
+                } else if (hidlManager.get("vendor.mediatek.hardware.mtkradioex@3.0::IMtkRadioEx", slot) != null) {
+                    return "mtk_s";
+                }
+            }
+        } catch (RemoteException ex) {}
+
+        return "none";
+    }
+
+}
+diff --git a/src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java b/src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
+new file mode 100644
+index 0000000000..1ab12d3ca0
+--- /dev/null
+++ b/src/com/android/settings/treble/OverrideVolteAvailabilityPreferenceController.java
+@@ -0,0 +1,59 @@
+package com.android.settings.treble;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class OverrideVolteAvailabilityPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String OVERRIDE_VOLTE_AVAILABILITY_KEY = "override_volte_availability";
+    private static final String[] IMSMANAGER_DEBUG_OVERRIDE_PROPERTIES = {
+        "persist.dbg.volte_avail_ovr",
+        "persist.dbg.wfc_avail_ovr",
+        "persist.dbg.allow_ims_off"
+    };
+
+    private SwitchPreference mSwitchPreference;
+
+    public OverrideVolteAvailabilityPreferenceController(Context context) {
+        super(context, OVERRIDE_VOLTE_AVAILABILITY_KEY);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return OVERRIDE_VOLTE_AVAILABILITY_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mSwitchPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        boolean checked = SystemProperties.getBoolean(IMSMANAGER_DEBUG_OVERRIDE_PROPERTIES[0], false);
+        mSwitchPreference.setChecked(checked);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        for (String prop: IMSMANAGER_DEBUG_OVERRIDE_PROPERTIES) {
+            SystemProperties.set(prop, ((boolean) newValue) ? "1" : "0");
+        }
+        mSwitchPreference.setChecked((boolean) newValue);
+        return true;
+    }
+
+}
+diff --git a/src/com/android/settings/treble/TrebleSettings.java b/src/com/android/settings/treble/TrebleSettings.java
+index 5c1611c053..50e3eda8c6 100644
+--- a/src/com/android/settings/treble/TrebleSettings.java
+++ b/src/com/android/settings/treble/TrebleSettings.java
+@@ -36,6 +36,8 @@ public class TrebleSettings extends DashboardFragment {
+         controllers.add(new DisableSoundvolumeEffectPreferenceController(context));
+         controllers.add(new ScreenResolutionRefreshRatePreferenceController(context));
+         controllers.add(new UseAlternativeBacklightScalePreferenceController(context));
+        controllers.add(new InstallImsApkPreferenceController(context));
+        controllers.add(new OverrideVolteAvailabilityPreferenceController(context));
+         return controllers;
+     }
+ 
+-- 
+2.25.1
+
--- a/patches_treble/packages_modules_Bluetooth/0001-Additionally-check-le_set_event_mask-command-resturn.patch
+++ b/patches_treble/packages_modules_Bluetooth/0001-Additionally-check-le_set_event_mask-command-resturn.patch
@ -0,0 +1,57 @@
+From a1d10cb31ae386c01a66c8bf0a028b8f33e5bd32 Mon Sep 17 00:00:00 2001
+From: "tzu-hsien.huang" <tzu-hsien.huang@mediatek.com>
+Date: Wed, 20 Jul 2022 15:12:01 +0800
+Subject: [PATCH 1/3] Additionally check le_set_event_mask command resturn
+ status with UNSUPPORTED_LMP_OR_LL_PARAMETER
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In GD BT stack, stack will check each return status of HCI Commands. E.g.  reset , le_set_event_mask, set_event_mask …etc.
+In BT spec 5.2, SIG add some parameters for le_set_event_mask for le audio, like LE Terminate BIG Complete event: Supported.
+However, some legacy chips do not support LE Audio feature, and controller will return Status: Unsupported LMP Parameter Value when it receives this HCI Command
+When it checks the return value and find the status is not SUCCESS, it will cause FAIL and cannot be compatible with old legacy chip.
+After brushing GSI, Bluetooth will turn off automatically when it is turned on.
+So all CTS test will always fail.
+
+Check le_set_event_mask command return status with SUCCESS or UNSUPPORTED_LMP_OR_LL_PARAMETER
+
+Bug: 239662211
+Test: CtsBluetoothTestCases
+Change-Id: I2b0cede7f47eecd2124a386e958773289eb6f11c
+---
+ system/gd/hci/controller.cc | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
+index da5986fcb7..8be21a20a3 100644
+--- a/system/gd/hci/controller.cc
+++ b/system/gd/hci/controller.cc
+@@ -540,7 +540,7 @@ struct Controller::impl {
+   void le_set_event_mask(uint64_t le_event_mask) {
+     std::unique_ptr<LeSetEventMaskBuilder> packet = LeSetEventMaskBuilder::Create(le_event_mask);
+     hci_->EnqueueCommand(std::move(packet), module_.GetHandler()->BindOnceOn(
+-                                                this, &Controller::impl::check_status<LeSetEventMaskCompleteView>));
+                                                this, &Controller::impl::check_event_mask_status<LeSetEventMaskCompleteView>));
+   }
+ 
+   template <class T>
+@@ -551,6 +551,15 @@ struct Controller::impl {
+     ASSERT(status_view.GetStatus() == ErrorCode::SUCCESS);
+   }
+ 
+  template <class T>
+  void check_event_mask_status(CommandCompleteView view) {
+    ASSERT(view.IsValid());
+    auto status_view = T::Create(view);
+    ASSERT(status_view.IsValid());
+    ASSERT(status_view.GetStatus() == ErrorCode::SUCCESS ||
+           status_view.GetStatus() == ErrorCode::UNSUPPORTED_LMP_OR_LL_PARAMETER);
+  }
+
+ #define OP_CODE_MAPPING(name)                                                  \
+   case OpCode::name: {                                                         \
+     uint16_t index = (uint16_t)OpCodeIndex::name;                              \
+-- 
+2.37.2
+
--- a/patches_treble/packages_modules_Bluetooth/0002-gd-hci-Ignore-unexpected-status-events.patch
+++ b/patches_treble/packages_modules_Bluetooth/0002-gd-hci-Ignore-unexpected-status-events.patch
@ -0,0 +1,43 @@
+From 0e2bf3f3d46efaa7d01d3554b7e5ceeac9664c69 Mon Sep 17 00:00:00 2001
+From: Peter Cai <peter@typeblog.net>
+Date: Wed, 24 Aug 2022 10:41:29 -0400
+Subject: [PATCH 2/3] gd: hci: Ignore unexpected status events
+
+For some reason, on some old devices, the controller will report a
+remote to support SNIFF_SUBRATING even when it does not. Just ignore the
+error here (the status event comes from the failure response).
+
+Change-Id: Ifb9a65fd77f21d15a8dc1ced9240194d38218ef6
+---
+ system/gd/hci/hci_layer.cc | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/system/gd/hci/hci_layer.cc b/system/gd/hci/hci_layer.cc
+index 57d7e55fff..b5a9d065be 100644
+--- a/system/gd/hci/hci_layer.cc
+++ b/system/gd/hci/hci_layer.cc
+@@ -195,14 +195,13 @@ struct HciLayer::impl {
+           EventView::Create(PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>(std::vector<uint8_t>()))));
+       command_queue_.front().GetCallback<CommandCompleteView>()->Invoke(move(command_complete_view));
+     } else {
+-      ASSERT_LOG(
+-          command_queue_.front().waiting_for_status_ == is_status,
+-          "0x%02hx (%s) was not expecting %s event",
+-          op_code,
+-          OpCodeText(op_code).c_str(),
+-          logging_id.c_str());
+-
+-      command_queue_.front().GetCallback<TResponse>()->Invoke(move(response_view));
+      if (command_queue_.front().waiting_for_status_ == is_status) {
+        command_queue_.front().GetCallback<TResponse>()->Invoke(move(response_view));
+      } else {
+        CommandCompleteView command_complete_view = CommandCompleteView::Create(
+            EventView::Create(PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>(std::vector<uint8_t>()))));
+        command_queue_.front().GetCallback<CommandCompleteView>()->Invoke(move(command_complete_view));
+      }
+     }
+ 
+     command_queue_.pop_front();
+-- 
+2.37.2
+
--- a/patches_treble/packages_modules_Bluetooth/0003-audio_hal_interface-Optionally-use-sysbta-HAL.patch
+++ b/patches_treble/packages_modules_Bluetooth/0003-audio_hal_interface-Optionally-use-sysbta-HAL.patch
@ -0,0 +1,107 @@
+From cad9f7f7aeaf57e5fead759bcc68b75262ba3708 Mon Sep 17 00:00:00 2001
+From: Peter Cai <peter@typeblog.net>
+Date: Wed, 24 Aug 2022 15:45:18 -0400
+Subject: [PATCH 3/3] audio_hal_interface: Optionally use sysbta HAL
+
+Required to support sysbta, our system-side bt audio implementation.
+
+Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860
+---
+ system/audio_hal_interface/aidl/client_interface_aidl.cc | 6 +++---
+ system/audio_hal_interface/aidl/client_interface_aidl.h  | 7 +++++++
+ system/audio_hal_interface/hal_version_manager.cc        | 9 ++++++++-
+ 3 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc
+index 814c6c7796..a38b6da495 100644
+--- a/system/audio_hal_interface/aidl/client_interface_aidl.cc
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
+@@ -55,7 +55,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface(
+ 
+ bool BluetoothAudioClientInterface::is_aidl_available() {
+   auto service = AServiceManager_checkService(
+-      kDefaultAudioProviderFactoryInterface.c_str());
+      audioProviderFactoryInterface().c_str());
+   return (service != nullptr);
+ }
+ 
+@@ -72,7 +72,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) {
+   }
+   auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
+       ::ndk::SpAIBinder(AServiceManager_getService(
+-          kDefaultAudioProviderFactoryInterface.c_str())));
+          audioProviderFactoryInterface().c_str())));
+ 
+   if (provider_factory == nullptr) {
+     LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
+@@ -100,7 +100,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() {
+   }
+   auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
+       ::ndk::SpAIBinder(AServiceManager_getService(
+-          kDefaultAudioProviderFactoryInterface.c_str())));
+          audioProviderFactoryInterface().c_str())));
+ 
+   if (provider_factory == nullptr) {
+     LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
+diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.h b/system/audio_hal_interface/aidl/client_interface_aidl.h
+index 87dd450997..36d5fa5e86 100644
+--- a/system/audio_hal_interface/aidl/client_interface_aidl.h
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.h
+@@ -28,6 +28,7 @@
+ #include "bluetooth_audio_port_impl.h"
+ #include "common/message_loop_thread.h"
+ #include "transport_instance.h"
+#include "osi/include/properties.h"
+ 
+ #define BLUETOOTH_AUDIO_HAL_PROP_DISABLED \
+   "persist.bluetooth.bluetooth_audio_hal.disabled"
+@@ -115,6 +116,12 @@ class BluetoothAudioClientInterface {
+   //     "android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory/default";
+   static inline const std::string kDefaultAudioProviderFactoryInterface =
+       std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";
+  static inline const std::string kSystemAudioProviderFactoryInterface =
+      std::string() + IBluetoothAudioProviderFactory::descriptor + "/sysbta";
+  static inline const std::string audioProviderFactoryInterface() {
+   return osi_property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)
+    ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface;
+  }
+ 
+  private:
+   IBluetoothTransportInstance* transport_;
+diff --git a/system/audio_hal_interface/hal_version_manager.cc b/system/audio_hal_interface/hal_version_manager.cc
+index a2c192f37d..c3d1cf35c2 100644
+--- a/system/audio_hal_interface/hal_version_manager.cc
+++ b/system/audio_hal_interface/hal_version_manager.cc
+@@ -24,6 +24,7 @@
+ #include <memory>
+ 
+ #include "aidl/audio_aidl_interfaces.h"
+#include "osi/include/properties.h"
+ 
+ namespace bluetooth {
+ namespace audio {
+@@ -33,6 +34,12 @@ using ::aidl::android::hardware::bluetooth::audio::
+ 
+ static const std::string kDefaultAudioProviderFactoryInterface =
+     std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";
+static const std::string kSystemAudioProviderFactoryInterface =
+    std::string() + IBluetoothAudioProviderFactory::descriptor + "/sysbta";
+static inline const std::string audioProviderFactoryInterface() {
+  return osi_property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)
+    ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface;
+}
+ 
+ std::unique_ptr<HalVersionManager> HalVersionManager::instance_ptr =
+     std::make_unique<HalVersionManager>();
+@@ -92,7 +99,7 @@ HalVersionManager::GetProvidersFactory_2_0() {
+ 
+ HalVersionManager::HalVersionManager() {
+   if (AServiceManager_checkService(
+-          kDefaultAudioProviderFactoryInterface.c_str()) != nullptr) {
+          audioProviderFactoryInterface().c_str()) != nullptr) {
+     hal_version_ = BluetoothAudioHalVersion::VERSION_AIDL_V1;
+     return;
+   }
+-- 
+2.37.2
+
--- a/patches_treble/system_bpf/0001-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch
+++ b/patches_treble/system_bpf/0001-Revert-detect-inability-to-write-to-index-0-of-bpf-m.patch
@ -0,0 +1,34 @@
+From 04eb0f02934f58c1c842da1ea365275ba03c5b58 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 19 Oct 2022 02:20:05 +0000
+Subject: [PATCH] Revert "detect inability to write to index != 0 of bpf map
+ array"
+
+This reverts commit ead9d83423877458023056f6ccf9390950d6726f.
+---
+ bpfloader/BpfLoader.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
+index 5cd80b7..bc72811 100644
+--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
+@@ -199,15 +199,6 @@ int main(int argc, char** argv) {
+         }
+     }
+ 
+-    int key = 1;
+-    int value = 123;
+-    android::base::unique_fd map(
+-            android::bpf::createMap(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value), 2, 0));
+-    if (android::bpf::writeToMapEntry(map, &key, &value, BPF_ANY)) {
+-        ALOGE("Critical kernel bug - failure to write into index 1 of 2 element bpf map array.");
+-        return 1;
+-    }
+-
+     if (android::base::SetProperty("bpf.progs_loaded", "1") == false) {
+         ALOGE("Failed to set bpf.progs_loaded property");
+         return 1;
+-- 
+2.25.1
+
--- a/patches_treble/system_core/0001-Make-xbin-and-su-executable-by-other.patch
+++ b/patches_treble/system_core/0001-Make-xbin-and-su-executable-by-other.patch
@ -0,0 +1,37 @@
+From 29ccba624ae893659126b2f6562c16909c2691c5 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 26 Sep 2022 14:41:41 +0000
+Subject: [PATCH 1/4] Make xbin and su executable by other
+
+Needed by PHH-SU
+
+Change-Id: I5304b787ce4602036904a373a409bb08f8f969de
+---
+ libcutils/fs_config.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
+index a6835fc70..a703993f6 100644
+--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
+@@ -86,7 +86,7 @@ static const struct fs_path_config android_dirs[] = {
+     { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },
+     { 00755, AID_ROOT,         AID_ROOT,         0, "system/etc/ppp" },
+     { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },
+-    { 00750, AID_ROOT,         AID_SHELL,        0, "system/xbin" },
+    { 00755, AID_ROOT,         AID_SHELL,        0, "system/xbin" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "system/apex/*/bin" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/bin" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/apex/*/bin" },
+@@ -190,7 +190,7 @@ static const struct fs_path_config android_files[] = {
+     // the following two files are INTENTIONALLY set-uid, but they
+     // are NOT included on user builds.
+     { 06755, AID_ROOT,      AID_ROOT,      0, "system/xbin/procmem" },
+-    { 04750, AID_ROOT,      AID_SHELL,     0, "system/xbin/su" },
+    { 04755, AID_ROOT,      AID_SHELL,     0, "system/xbin/su" },
+ 
+     // the following files have enhanced capabilities and ARE included
+     // in user builds.
+-- 
+2.25.1
+
--- a/patches_treble/system_core/0002-Restore-sbin-for-Magisk-compatibility.patch
+++ b/patches_treble/system_core/0002-Restore-sbin-for-Magisk-compatibility.patch
@ -0,0 +1,87 @@
+From c4d992edc94f3db949b6146428c978bf8036f345 Mon Sep 17 00:00:00 2001
+From: Victor Bo <bvoid@yandex.ru>
+Date: Wed, 3 Mar 2021 06:31:17 -0500
+Subject: [PATCH 2/4] Restore /sbin for Magisk compatibility
+
+Squash of:
+- Revert "Do not create /sbin"
+- Revert "Remove sbin from fs_config.cpp"
+- add /sbin to the PATH
+
+Change-Id: I1224c9b64ce8eb14f7d15c8441c0633a7e6a20de
+---
+ CleanSpec.mk               | 2 --
+ libcutils/fs_config.cpp    | 3 +++
+ rootdir/Android.mk         | 2 +-
+ rootdir/init.environ.rc.in | 1 +
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CleanSpec.mk b/CleanSpec.mk
+index 0a534a2bd..81150a0fa 100644
+--- a/CleanSpec.mk
+++ b/CleanSpec.mk
+@@ -80,8 +80,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vndksp.libraries.txt)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin/charger)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin/charger)
+-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin)
+-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sbin)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services.img)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)
+diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
+index a703993f6..184c7da0f 100644
+--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
+@@ -80,6 +80,7 @@ static const struct fs_path_config android_dirs[] = {
+     { 00771, AID_SYSTEM,       AID_SYSTEM,       0, "data" },
+     { 00755, AID_ROOT,         AID_SYSTEM,       0, "mnt" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "product/bin" },
+    { 00750, AID_ROOT,         AID_SHELL,        0, "sbin" },
+     { 00751, AID_ROOT,         AID_SHELL,        0, "product/apex/*/bin" },
+     { 00777, AID_ROOT,         AID_ROOT,         0, "sdcard" },
+     { 00751, AID_ROOT,         AID_SDCARD_R,     0, "storage" },
+@@ -166,6 +167,7 @@ static const struct fs_path_config android_files[] = {
+     { 00600, AID_ROOT,      AID_ROOT,      0, "system_ext/build.prop" },
+     { 00444, AID_ROOT,      AID_ROOT,      0, system_ext_conf_dir + 1 },
+     { 00444, AID_ROOT,      AID_ROOT,      0, system_ext_conf_file + 1 },
+    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/debuggerd" },
+@@ -218,6 +220,7 @@ static const struct fs_path_config android_files[] = {
+     { 00750, AID_ROOT,      AID_SHELL,     0, "init*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "odm/bin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "product/bin/*" },
+    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "product/apex/*bin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/*" },
+     { 00755, AID_ROOT,      AID_SHELL,     0, "system/xbin/*" },
+diff --git a/rootdir/Android.mk b/rootdir/Android.mk
+index fe23b6206..81bd46342 100644
+--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
+@@ -91,7 +91,7 @@ endif
+ #
+ # create some directories (some are mount points) and symlinks
+ LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
+-    dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \
+    sbin dev proc sys system data data_mirror odm oem acct config storage mnt apex debug_ramdisk \
+     linkerconfig second_stage_resources postinstall $(BOARD_ROOT_EXTRA_FOLDERS)); \
+     ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \
+     ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \
+diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
+index bf6e986c4..090fa5a78 100644
+--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
+@@ -10,6 +10,7 @@ on early-init
+     export ANDROID_TZDATA_ROOT /apex/com.android.tzdata
+     export EXTERNAL_STORAGE /sdcard
+     export ASEC_MOUNTPOINT /mnt/asec
+    export PATH /sbin:/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system_ext/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin
+     %EXPORT_GLOBAL_ASAN_OPTIONS%
+     %EXPORT_GLOBAL_GCOV_OPTIONS%
+     %EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%
+-- 
+2.25.1
+
--- a/patches_treble/system_core/0003-Stop-overriding-system-properties-from-vendor.patch
+++ b/patches_treble/system_core/0003-Stop-overriding-system-properties-from-vendor.patch
@ -0,0 +1,27 @@
+From b58f1976ed11252c29c1ecb711dd073856998d7d Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Thu, 7 Oct 2021 15:48:11 -0400
+Subject: [PATCH 3/4] Stop overriding system properties from vendor
+
+This is annoying to disable apexes, or force adb
+
+Change-Id: Ifd0072c631349b23945df4ab401ba26eca07131f
+---
+ init/property_service.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/init/property_service.cpp b/init/property_service.cpp
+index 8db414a97..ff79ce8a0 100644
+--- a/init/property_service.cpp
+++ b/init/property_service.cpp
+@@ -727,7 +727,6 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
+                 } else if (it->second != value) {
+                     LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
+                                  << "' with new value '" << value << "'";
+-                    it->second = value;
+                 }
+             } else {
+                 LOG(ERROR) << "Do not have permissions to set '" << key << "' to '" << value
+-- 
+2.25.1
+
--- a/patches_treble/system_core/0004-init-Do-not-start-console-service-when-debuggable.patch
+++ b/patches_treble/system_core/0004-init-Do-not-start-console-service-when-debuggable.patch
@ -0,0 +1,31 @@
+From 60937ffa51434cde846397f81b2771cfe9f4ec5d Mon Sep 17 00:00:00 2001
+From: Isaac Chen <tingyi364@gmail.com>
+Date: Wed, 23 Jun 2021 13:07:30 +0800
+Subject: [PATCH 4/4] init: Do not start console service when debuggable
+
+Google added a check for this in R, when it's running it will show a
+notification about that performance is impacted.
+
+Signed-off-by: Isaac Chen <tingyi364@gmail.com>
+Change-Id: I34cfd6b42d3b9aee4b3e63181480cfb8b1255f29
+---
+ rootdir/init.rc | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/rootdir/init.rc b/rootdir/init.rc
+index cd71aa8aa..417de0d4a 100644
+--- a/rootdir/init.rc
+++ b/rootdir/init.rc
+@@ -1268,9 +1268,6 @@ on property:ro.debuggable=1
+     # Give reads to anyone for the accessibility trace folder on debug builds.
+     chmod 0775 /data/misc/a11ytrace
+ 
+-on init && property:ro.debuggable=1
+-    start console
+-
+ on userspace-reboot-requested
+   # TODO(b/135984674): reset all necessary properties here.
+   setprop sys.boot_completed ""
+-- 
+2.25.1
+
--- a/patches_treble/vendor_hardware_overlay/0001-Exclude-TrebleApp-co.patch
+++ b/patches_treble/vendor_hardware_overlay/0001-Exclude-TrebleApp-co.patch
@ -0,0 +1,25 @@
+From 1614817aa551569818e7d3f09e0ddbc8ac4cf796 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Wed, 21 Sep 2022 13:36:07 +0000
+Subject: [PATCH 1/2] Exclude TrebleApp & co.
+
+Change-Id: Ieb62801a79c6e015634fd58b654c63c1de5aef7e
+---
+ overlay.mk | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/overlay.mk b/overlay.mk
+index 80b1ff4..10c8855 100644
+--- a/overlay.mk
+++ b/overlay.mk
+@@ -1,7 +1,4 @@
+ PRODUCT_PACKAGES += \
+-	HardwareOverlayPicker \
+-	QtiAudio \
+-	TrebleApp \
+ 	treble-overlay-NavBar \
+ 	treble-overlay-NightMode \
+ 	treble-overlay-SystemUI-FalseLocks \
+-- 
+2.25.1
+
--- a/patches_treble/vendor_hardware_overlay/0002-Enable-IMS-overlays-statically-on-QCOM-MTK-devices.patch
+++ b/patches_treble/vendor_hardware_overlay/0002-Enable-IMS-overlays-statically-on-QCOM-MTK-devices.patch
@ -0,0 +1,161 @@
+From 93192b8e62ac4a9ac9dd8241793830ceb063a4b8 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 11 Oct 2022 10:53:34 +0000
+Subject: [PATCH 2/2] Enable IMS overlays statically on QCOM/MTK devices
+
+Change-Id: I851cf859328cc431e8bb163297c33837d4270f58
+---
+ CAF-IMS/AndroidManifest.xml             | 8 ++++----
+ CAF-IMS/res/values/config.xml           | 4 ++--
+ MTK-IMS/AndroidManifest.xml             | 8 ++++----
+ MTK-IMS/res/values/config.xml           | 8 +++++---
+ Telephony/CAF-IMS/Android.mk            | 2 ++
+ Telephony/CAF-IMS/AndroidManifest.xml   | 6 ++++--
+ Telephony/CAF-IMS/res/values/config.xml | 2 +-
+ Telephony/MTK-IMS/Android.mk            | 2 ++
+ Telephony/MTK-IMS/AndroidManifest.xml   | 6 ++++--
+ Telephony/MTK-IMS/res/values/config.xml | 3 +--
+ 10 files changed, 29 insertions(+), 20 deletions(-)
+
+diff --git a/CAF-IMS/AndroidManifest.xml b/CAF-IMS/AndroidManifest.xml
+index 47236c6..5376fb8 100644
+--- a/CAF-IMS/AndroidManifest.xml
+++ b/CAF-IMS/AndroidManifest.xml
+@@ -3,8 +3,8 @@
+         android:versionCode="1"
+         android:versionName="1.0">
+         <overlay android:targetPackage="android"
+-                android:requiredSystemPropertyName="persist.sys.phh.ims.caf"
+-                android:requiredSystemPropertyValue="true"
+-		android:priority="39"
+-		android:isStatic="true" />
+                android:requiredSystemPropertyName="ro.hardware"
+                android:requiredSystemPropertyValue="qcom"
+        android:priority="39"
+        android:isStatic="true" />
+ </manifest>
+diff --git a/CAF-IMS/res/values/config.xml b/CAF-IMS/res/values/config.xml
+index 1af87c7..5b85ebd 100644
+--- a/CAF-IMS/res/values/config.xml
+++ b/CAF-IMS/res/values/config.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <resources>
+-	<string name="config_ims_package">org.codeaurora.ims</string>
+-	<bool name="config_dynamic_bind_ims">true</bool>
+    <string name="config_ims_package">org.codeaurora.ims</string>
+    <bool name="config_dynamic_bind_ims">true</bool>
+     <bool name="config_carrier_volte_available">true</bool>
+     <bool name="config_device_volte_available">true</bool>
+     <bool name="config_device_wfc_ims_available">true</bool>
+diff --git a/MTK-IMS/AndroidManifest.xml b/MTK-IMS/AndroidManifest.xml
+index 96ba83e..33132cc 100644
+--- a/MTK-IMS/AndroidManifest.xml
+++ b/MTK-IMS/AndroidManifest.xml
+@@ -3,8 +3,8 @@
+         android:versionCode="1"
+         android:versionName="1.0">
+         <overlay android:targetPackage="android"
+-                android:requiredSystemPropertyName="persist.sys.phh.ims.mtk"
+-                android:requiredSystemPropertyValue="true"
+-		android:priority="79"
+-		android:isStatic="true" />
+                android:requiredSystemPropertyName="ro.hardware"
+                android:requiredSystemPropertyValue="+mt6*"
+        android:priority="79"
+        android:isStatic="true" />
+ </manifest>
+diff --git a/MTK-IMS/res/values/config.xml b/MTK-IMS/res/values/config.xml
+index f5e0486..2d49a11 100644
+--- a/MTK-IMS/res/values/config.xml
+++ b/MTK-IMS/res/values/config.xml
+@@ -1,6 +1,8 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <resources>
+-	<string name="config_ims_package">com.mediatek.ims</string>
+-        <bool name="config_carrier_volte_available">true</bool>
+-	<bool name="config_dynamic_bind_ims">true</bool>
+    <string name="config_ims_package">com.mediatek.ims</string>
+    <bool name="config_dynamic_bind_ims">true</bool>
+    <bool name="config_carrier_volte_available">true</bool>
+    <bool name="config_device_volte_available">true</bool>
+    <bool name="config_device_wfc_ims_available">true</bool>
+ </resources>
+diff --git a/Telephony/CAF-IMS/Android.mk b/Telephony/CAF-IMS/Android.mk
+index 7785cc3..416f501 100644
+--- a/Telephony/CAF-IMS/Android.mk
+++ b/Telephony/CAF-IMS/Android.mk
+@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
+ include $(CLEAR_VARS)
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_PACKAGE_NAME := treble-overlay-telephony-caf-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+ LOCAL_PRIVATE_PLATFORM_APIS := true
+ include $(BUILD_PACKAGE)
+diff --git a/Telephony/CAF-IMS/AndroidManifest.xml b/Telephony/CAF-IMS/AndroidManifest.xml
+index 2267406..365525c 100644
+--- a/Telephony/CAF-IMS/AndroidManifest.xml
+++ b/Telephony/CAF-IMS/AndroidManifest.xml
+@@ -3,6 +3,8 @@
+         android:versionCode="1"
+         android:versionName="1.0">
+         <overlay android:targetPackage="com.android.phone"
+-		android:priority="79"
+-		/>
+                android:requiredSystemPropertyName="ro.hardware"
+                android:requiredSystemPropertyValue="qcom"
+        android:priority="79"
+        android:isStatic="true" />
+ </manifest>
+diff --git a/Telephony/CAF-IMS/res/values/config.xml b/Telephony/CAF-IMS/res/values/config.xml
+index 565ee42..ddf685d 100644
+--- a/Telephony/CAF-IMS/res/values/config.xml
+++ b/Telephony/CAF-IMS/res/values/config.xml
+@@ -1,4 +1,4 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <resources>
+-	<string name="config_ims_mmtel_package">org.codeaurora.ims</string>
+    <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
+ </resources>
+diff --git a/Telephony/MTK-IMS/Android.mk b/Telephony/MTK-IMS/Android.mk
+index 314b1a9..d08cb5a 100644
+--- a/Telephony/MTK-IMS/Android.mk
+++ b/Telephony/MTK-IMS/Android.mk
+@@ -2,5 +2,7 @@ LOCAL_PATH := $(call my-dir)
+ include $(CLEAR_VARS)
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_PACKAGE_NAME := treble-overlay-telephony-mtk-ims
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+ LOCAL_PRIVATE_PLATFORM_APIS := true
+ include $(BUILD_PACKAGE)
+diff --git a/Telephony/MTK-IMS/AndroidManifest.xml b/Telephony/MTK-IMS/AndroidManifest.xml
+index 5afe885..644d06b 100644
+--- a/Telephony/MTK-IMS/AndroidManifest.xml
+++ b/Telephony/MTK-IMS/AndroidManifest.xml
+@@ -3,6 +3,8 @@
+         android:versionCode="1"
+         android:versionName="1.0">
+         <overlay android:targetPackage="com.android.phone"
+-		android:priority="79"
+-		/>
+                android:requiredSystemPropertyName="ro.hardware"
+                android:requiredSystemPropertyValue="+mt6*"
+        android:priority="79"
+        android:isStatic="true" />
+ </manifest>
+diff --git a/Telephony/MTK-IMS/res/values/config.xml b/Telephony/MTK-IMS/res/values/config.xml
+index ead0cc2..01eca95 100644
+--- a/Telephony/MTK-IMS/res/values/config.xml
+++ b/Telephony/MTK-IMS/res/values/config.xml
+@@ -1,5 +1,4 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <resources>
+-	<string name="config_ims_mmtel_package">com.mediatek.ims</string>
+-
+    <string name="config_ims_mmtel_package">com.mediatek.ims</string>
+ </resources>
+-- 
+2.25.1
+
--- a/patches_treble/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch
+++ b/patches_treble/vendor_lineage/0001-vendor_lineage-Commonly-build-some-packages.patch
@ -0,0 +1,38 @@
+From 1193bdf321a07cbffbad383cf3a9968d293099c1 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 24 Sep 2022 11:40:52 +0000
+Subject: [PATCH 1/2] vendor_lineage: Commonly build some packages
+
+These were in handheld_product.mk and thus weren't included in GSI targets:
+Contacts, DeskClock, Gallery2, fwb overlays
+
+Change-Id: I00cc5918164ed70c612c5caa31eb8d2d0cd05b62
+---
+ config/common_mobile.mk | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/config/common_mobile.mk b/config/common_mobile.mk
+index 547804ce..3c58d9ff 100644
+--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
+@@ -10,12 +10,16 @@ PRODUCT_PRODUCT_PROPERTIES += \
+ PRODUCT_PACKAGES += \
+     Aperture \
+     Backgrounds \
+    Contacts \
+    DeskClock \
+     Eleven \
+     Etar \
+     ExactCalculator \
+    Gallery2 \
+     Jelly \
+     Profiles \
+-    Seedvault
+    Seedvault \
+    frameworks-base-overlays
+ 
+ ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
+ PRODUCT_PACKAGES += \
+-- 
+2.25.1
+
--- a/patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
+++ b/patches_treble/vendor_lineage/0002-vendor_lineage-Disable-ADB-authentication.patch
@ -0,0 +1,34 @@
+From 60803f4939a1df05b7c29925a987efe7e899ba7c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Tue, 19 Oct 2021 15:48:43 +0000
+Subject: [PATCH 2/2] vendor_lineage: Disable ADB authentication
+
+Change-Id: I4370583ecab1c88ef6f42e29d3eaa52c24d13f09
+---
+ config/common.mk | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/config/common.mk b/config/common.mk
+index 52a4bfd4..a57536c3 100644
+--- a/config/common.mk
+++ b/config/common.mk
+@@ -13,16 +13,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
+ endif
+ 
+-ifeq ($(TARGET_BUILD_VARIANT),eng)
+ # Disable ADB authentication
+ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.adb.secure=0
+-else
+-# Enable ADB authentication
+-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.adb.secure=1
+ 
+ # Disable extra StrictMode features on all non-engineering builds
+ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.sys.strictmode.disable=true
+-endif
+ 
+ # Backup Tool
+ PRODUCT_COPY_FILES += \
+-- 
+2.25.1
+
--- a/patches_treble_personal/build_make/0001-Skip-mounting-my_manifest-on-GSIs.patch
+++ b/patches_treble_personal/build_make/0001-Skip-mounting-my_manifest-on-GSIs.patch
@ -0,0 +1,27 @@
+From a1ae87fa01e6e31fb733045d05a956ba4dfd00d6 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sat, 24 Sep 2022 07:44:20 +0000
+Subject: [PATCH] Skip mounting /my_manifest on GSIs
+
+On OPlus devices, /my_manifest/build.prop unnecessarily overrides a ton of props
+All my_* partitions are supposedly useless on GSIs, but only skip this for now
+
+Change-Id: I638fd8ed2cfd7ca835a8e46fd235ebf08c2460a4
+---
+ target/product/gsi/gsi_skip_mount.cfg | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/target/product/gsi/gsi_skip_mount.cfg b/target/product/gsi/gsi_skip_mount.cfg
+index 28f434966..612c3bc81 100644
+--- a/target/product/gsi/gsi_skip_mount.cfg
+++ b/target/product/gsi/gsi_skip_mount.cfg
+@@ -7,3 +7,6 @@
+ /product/*
+ /system_ext/*
+ /system/*
+# Skip OPlus "my_manifest" mountpoints.
+/mnt/vendor/my_manifest
+/my_manifest
+-- 
+2.25.1
+