Changes for June 2023

patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch

@@ -1,126 +0,0 @@
-From d2d9150fee51378f34efff4ba7f50a194bb85064 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/23] 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.34.1
-

patches_platform/frameworks_base/0001-Check-null-FingerprintManager-first-in-onStartedWaki.patch

@@ -0,0 +1,28 @@
+From 9fb18df98c435af869b08b4796e45b9b8fe8c7cf Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 18 Jun 2023 19:56:36 +0800
+Subject: [PATCH 01/23] Check null FingerprintManager first in
+ onStartedWakingUp
+
+Fixes crashing when unlocking from AOD
+
+Change-Id: I80423b14bbe54989fb9a561271e84988e7427209
+---
+ .../android/systemui/statusbar/phone/CentralSurfacesImpl.java    | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+index ec8a7a4ffdd3..5462cfdebef4 100644
+--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
++++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+@@ -3587,6 +3587,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune
+                                     && mStatusBarStateController.getDozeAmount() == 1f
+                                     && mWakefulnessLifecycle.getLastWakeReason()
+                                     == PowerManager.WAKE_REASON_POWER_BUTTON
++                                    && mFingerprintManager.get() != null
+                                     && mFingerprintManager.get().isPowerbuttonFps()
+                                     && mFingerprintManager.get().hasEnrolledFingerprints()
+                                     && !touchToUnlockAnytime;
+-- 
+2.34.1
+

patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch

@@ -1,4 +1,4 @@
-From 80b9721f6e8da1f45ca5ebff8870f235efcb2c1e Mon Sep 17 00:00:00 2001
+From ecfa5198eff7f7ce4276cd11469f53bd7aabe8ca Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Fri, 22 Mar 2019 00:41:20 +0800
 Subject: [PATCH 02/23] Disable FP lockouts optionally

patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch

@@ -1,4 +1,4 @@
-From 908593ecda65f87bbcbda662f9e35de0d7ba94f4 Mon Sep 17 00:00:00 2001
+From 42a0b3f0599704873de0ac0aca2c1e67adc18c26 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 5 Apr 2018 10:01:19 +0800
 Subject: [PATCH 03/23] Disable vendor mismatch warning
@@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
  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 3e1b30b2ff25..8681bd726f3b 100644
+index 577b27b73b43..a0151468b967 100644
 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
 +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
-@@ -5859,20 +5859,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
+@@ -5869,20 +5869,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
                  }
  
                  if (!Build.isBuildConsistent()) {

patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch

@@ -1,4 +1,4 @@
-From e08d2afd0c6663e9d439b9371d9aba20f3e566e5 Mon Sep 17 00:00:00 2001
+From 5be23474b8d72aa5111e78718272f23a31422295 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 17 Jan 2023 17:19:19 +0000
 Subject: [PATCH 04/23] Keyguard: Fix colors of slices not updating on doze
@@ -13,10 +13,10 @@ Change-Id: I06abd8bf2e28655cc9e6d81366fd82a13454ec5a
  2 files changed, 8 insertions(+)
 
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-index aec30632c41e..7ef624a6f184 100644
+index f4c581552bc4..c0f983551877 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
-@@ -99,6 +99,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
+@@ -97,6 +97,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
          mKeyguardSliceViewController.refresh();
      }
  
@@ -31,10 +31,10 @@ index aec30632c41e..7ef624a6f184 100644
       * Set which clock should be displayed on the keyguard. The other one will be automatically
       * hidden.
 diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
-index 731ce92099e8..3e748a0f2722 100644
+index 3dbb6e0ccedb..778261ef6d1f 100644
 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
-@@ -5718,6 +5718,7 @@ public final class NotificationPanelViewController implements Dumpable {
+@@ -4421,6 +4421,7 @@ public final class NotificationPanelViewController implements Dumpable {
          public void onDozeAmountChanged(float linearAmount, float amount) {
              mInterpolatedDarkAmount = amount;
              mLinearDarkAmount = linearAmount;

patches_platform/frameworks_base/0005-UI-Adjust-default-navbar-layouts.patch

@@ -1,4 +1,4 @@
-From ef9cee9e51e0c3a3020a83b1e18f229c4e45498a Mon Sep 17 00:00:00 2001
+From 56a81a819bb62e59f41552ff21d4e98133049b7f 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 05/23] UI: Adjust default navbar layouts
@@ -45,7 +45,7 @@ index 07b797a32428..000000000000
 -    <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 48c35ae8789d..70269b18a573 100644
+index 374cff002d29..418bbc7c7932 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -301,7 +301,7 @@

patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch

@@ -1,4 +1,4 @@
-From 4bb9def8e58fa46890cdf93672e35a298bd595ff Mon Sep 17 00:00:00 2001
+From 649ce048d4f01ac4ed24ede16f7e7f185cdb1f67 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 10 Jan 2021 11:44:29 +0000
 Subject: [PATCH 06/23] UI: Disable wallpaper zoom
@@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 987426f56463..c2e2c91b2829 100644
+index 91dd9179c329..75941bbb8cd3 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -5146,7 +5146,7 @@
+@@ -5203,7 +5203,7 @@
      <item name="config_wallpaperMinScale" format="float" type="dimen">1</item>
  
      <!-- The max scale for the wallpaper when it's zoomed in -->

patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch

@@ -1,4 +1,4 @@
-From f439b01c40e9c9af40b40dfb80f7422775c587d6 Mon Sep 17 00:00:00 2001
+From 4766c45fdd4cf28209445a209fab52b4d09f057d 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 07/23] UI: Follow Monet and light/dark theme in user 1 icon
@@ -22,10 +22,10 @@ index ffaccd3ddc57..e2a955b89c77 100644
      <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 d5875f547e91..c7711ed3e493 100644
+index b83d3b4ea298..7586684ea936 100644
 --- a/core/res/res/values/colors.xml
 +++ b/core/res/res/values/colors.xml
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@
      <color name="system_notification_accent_color">#00000000</color>
  
      <!-- Default user icon colors -->

patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch

@@ -1,4 +1,4 @@
-From 8f0163c65d95e9ecfb4eb3e573040d22c9693ebb Mon Sep 17 00:00:00 2001
+From 22415704f766f87342d2fe61ac17d485263d8fb9 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 08/23] UI: Increase default status bar height

patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch

@@ -1,4 +1,4 @@
-From e3ad3c7f7bbdb5913feddced1a1a36652d849f9d Mon Sep 17 00:00:00 2001
+From 01a3d9b6958a779bad976d07c38b06f518178072 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 09/23] UI: Remove QS footer background

patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch

@@ -1,4 +1,4 @@
-From 4a51c5c42de7b550ce9a13322d63c44a8bbd76d8 Mon Sep 17 00:00:00 2001
+From 15e2a02275c1de3c194f18079b12bb3220afb862 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 10/23] UI: Restore split-screen divider to pre-Sv2 looks
@@ -8,28 +8,57 @@ Subject: [PATCH 10/23] UI: Restore split-screen divider to pre-Sv2 looks
 
 Change-Id: I240b627793b615c82bd07ebd77638cde180ef80f
 ---
- .../res/color/split_divider_background.xml    |  4 ++--
+ .../Shell/res/values-sw600dp/colors.xml       | 21 +++++++++++++++++++
- .../wm/shell/common/split/SplitLayout.java    | 19 ++-----------------
+ .../WindowManager/Shell/res/values/colors.xml |  2 +-
- 2 files changed, 4 insertions(+), 19 deletions(-)
+ .../wm/shell/common/split/SplitLayout.java    | 19 ++---------------
+ 3 files changed, 24 insertions(+), 18 deletions(-)
+ create mode 100644 libs/WindowManager/Shell/res/values-sw600dp/colors.xml
 
-diff --git a/libs/WindowManager/Shell/res/color/split_divider_background.xml b/libs/WindowManager/Shell/res/color/split_divider_background.xml
+diff --git a/libs/WindowManager/Shell/res/values-sw600dp/colors.xml b/libs/WindowManager/Shell/res/values-sw600dp/colors.xml
-index 049980803ee3..cd54ac26a7fd 100644
+new file mode 100644
---- a/libs/WindowManager/Shell/res/color/split_divider_background.xml
+index 000000000000..79db59cad3c2
-+++ b/libs/WindowManager/Shell/res/color/split_divider_background.xml
+--- /dev/null
-@@ -15,5 +15,5 @@
++++ b/libs/WindowManager/Shell/res/values-sw600dp/colors.xml
-   ~ limitations under the License.
+@@ -0,0 +1,21 @@
-   -->
++<?xml version="1.0" encoding="utf-8"?>
- <selector xmlns:android="http://schemas.android.com/apk/res/android">
++<!--
--    <item android:color="@android:color/system_neutral1_500" android:lStar="15" />
++/*
--</selector>
++ * Copyright 2020, The Android Open Source Project
-\ No newline at end of file
++ *
-+    <item android:color="@android:color/black" />
++ * Licensed under the Apache License, Version 2.0 (the "License");
-+</selector>
++ * 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>
++    <color name="split_divider_background">@color/taskbar_background</color>
++</resources>
+diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml
+index 6fb70006e67f..906dc71d623a 100644
+--- a/libs/WindowManager/Shell/res/values/colors.xml
++++ b/libs/WindowManager/Shell/res/values/colors.xml
+@@ -18,7 +18,7 @@
+ -->
+ <resources>
+     <color name="docked_divider_handle">#000000</color>
+-    <color name="split_divider_background">@color/taskbar_background</color>
++    <color name="split_divider_background">@android:color/black</color>
+     <drawable name="forced_resizable_background">#59000000</drawable>
+     <color name="minimize_dock_shadow_start">#60000000</color>
+     <color name="minimize_dock_shadow_end">#00000000</color>
 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 45b234a6398a..f0b1ff3999bc 100644
+index b4acd6046182..b0a05d7c80d9 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
-@@ -153,23 +153,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
+@@ -154,23 +154,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
      }
  
      private void updateDividerConfig(Context context) {

patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch

@@ -1,4 +1,4 @@
-From fd92d595cd2d3caa015c1ab1749c1a06c472ba82 Mon Sep 17 00:00:00 2001
+From 4b24750cb511cb2666335b46e053d2b3791e1d94 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 11/23] UI: Revive navbar layout tuning via sysui_nav_bar

patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch

@@ -1,4 +1,4 @@
-From ae22c5903fb6bd176d1df8de0292df0c386f1f80 Mon Sep 17 00:00:00 2001
+From 6957050c84f0fd86972408b016f3835e450de13b 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 12/23] UI: Use SNAP_FIXED_RATIO for multi-window globally
@@ -78,10 +78,10 @@ index 34b6a54be493..3921c9edfeac 100644
           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 c2e2c91b2829..8f81427cbe67 100644
+index 75941bbb8cd3..87e3ddcf8fdf 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3829,7 +3829,7 @@
+@@ -3882,7 +3882,7 @@
               1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio)
               2 - 1 snap target: 1:1
      -->

patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch

@@ -1,4 +1,4 @@
-From 519ee96fabf6d29ed22641f3a587012d92cc6846 Mon Sep 17 00:00:00 2001
+From 37a4d23386f038939c42819f050d22bd23627292 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 3 Nov 2020 22:43:12 -0800
 Subject: [PATCH 13/23] core: Remove old app target SDK dialog

patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch

@@ -1,4 +1,4 @@
-From b715efda04efd69a0bfd4a9fd003e519b1255e96 Mon Sep 17 00:00:00 2001
+From ad6e9615c4473cb86b36ef383dfb74f4df078901 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 21:01:50 -0700
 Subject: [PATCH 14/23] Paint: Enable subpixel text positioning by default

patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch

@@ -1,4 +1,4 @@
-From 8b06ea31edf57c5b6252a188f2035c92c6c2bd31 Mon Sep 17 00:00:00 2001
+From d6f40aec4b7a24c61f37c0c46240b4a263e4e796 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Sat, 16 Oct 2021 05:27:57 -0700
 Subject: [PATCH 15/23] Add support for app signature spoofing
@@ -58,10 +58,10 @@ index 487e57d114c9..04e69741b9fd 100644
      field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
      field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
 diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index bbe31240f5f3..7d717b2106a1 100644
+index bbc3a7369423..af04d9d18fbd 100644
 --- a/core/res/AndroidManifest.xml
 +++ b/core/res/AndroidManifest.xml
-@@ -3572,6 +3572,21 @@
+@@ -3577,6 +3577,21 @@
          android:description="@string/permdesc_getPackageSize"
          android:protectionLevel="normal" />
  
@@ -84,10 +84,10 @@ index bbe31240f5f3..7d717b2106a1 100644
           {@link android.content.pm.PackageManager#addPackageToPreferred}
           for details. -->
 diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
-index 9410e0682106..7ed7a03f1b61 100644
+index 2091c0502b6f..6888edcf7d3c 100644
 --- a/core/res/res/values/strings.xml
 +++ b/core/res/res/values/strings.xml
-@@ -977,6 +977,18 @@
+@@ -982,6 +982,18 @@
  
      <!--  Permissions -->
  

patches_platform/frameworks_base/0016-Spoof-product-name-for-Google-Play-Services.patch

@@ -1,4 +1,4 @@
-From dff8fbe5dfceacfd51b3606d7b137616911a6cf6 Mon Sep 17 00:00:00 2001
+From ecbc82fa7365a4fd123a7ad945c41c0b6b78658c Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 19:59:51 -0700
 Subject: [PATCH 16/23] Spoof product name for Google Play Services

patches_platform/frameworks_base/0017-keystore-Block-key-attestation-for-SafetyNet.patch

@@ -1,4 +1,4 @@
-From bf57e2c0560a94601c465de9cce8ae77111ba37f Mon Sep 17 00:00:00 2001
+From 229fe76ca5e1980981668fa0fc926b0982e91fba Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 20:00:44 -0700
 Subject: [PATCH 17/23] keystore: Block key attestation for SafetyNet

patches_platform/frameworks_base/0018-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch

@@ -1,4 +1,4 @@
-From 4b2da805e60f7456b60fbef0399b42270bd6d1d8 Mon Sep 17 00:00:00 2001
+From 56dbd5d3d3a54582731fcfeacaed9fa8ac542ea6 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 1 Nov 2021 20:06:48 -0700
 Subject: [PATCH 18/23] Limit SafetyNet workarounds to unstable GMS process

patches_platform/frameworks_base/0019-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch

@@ -1,4 +1,4 @@
-From 3e127f227f91e2cda68ae28c531c7f7034693b9e Mon Sep 17 00:00:00 2001
+From 502ad20c8b29c937821a70f26be83f481b941e4f Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 23 Aug 2022 18:57:05 +0200
 Subject: [PATCH 19/23] gmscompat: Apply the SafetyNet workaround to Play Store

patches_platform/frameworks_base/0020-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch

@@ -1,4 +1,4 @@
-From 408d79cb171d9d9d4e78c068601c8e08047b18d0 Mon Sep 17 00:00:00 2001
+From 643dcbbac4e1955c62f7760fefad20d261797e5b Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Thu, 8 Sep 2022 14:39:52 +0200
 Subject: [PATCH 20/23] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity

patches_platform/frameworks_base/0021-gmscompat-Use-actual-device-model-name.patch

@@ -1,4 +1,4 @@
-From 9e51495edc14e3cf1609eccf3d65a71720c17a09 Mon Sep 17 00:00:00 2001
+From 3f021fc317d07d0d9443832bc568161707013746 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Tue, 6 Dec 2022 15:59:08 +0100
 Subject: [PATCH 21/23] gmscompat: Use actual device model name

patches_platform/frameworks_base/0022-gmscompat-Set-shipping-level-to-32-for-devices-33.patch

@@ -1,4 +1,4 @@
-From f7ac5b583424583d440b7f2ce6bdce96fce2e209 Mon Sep 17 00:00:00 2001
+From 721c979c994c6cdf4f92dfb283d28cfeaf649a51 Mon Sep 17 00:00:00 2001
 From: Anirudh Gupta <anirudhgupta109@aosip.dev>
 Date: Wed, 4 Jan 2023 18:20:56 +0000
 Subject: [PATCH 22/23] gmscompat: Set shipping level to 32 for devices >=33

patches_platform/frameworks_base/0023-gmscompat-Make-CTS-Play-Integrity-pass-again.patch

@@ -1,4 +1,4 @@
-From ebbe0af4cff77d27ab5b7b23c5d86f947428b4c4 Mon Sep 17 00:00:00 2001
+From 69908af269c76085862d4034abf615e5416838a1 Mon Sep 17 00:00:00 2001
 From: Dyneteve <dyneteve@hentaios.com>
 Date: Wed, 8 Feb 2023 15:21:01 +0000
 Subject: [PATCH 23/23] gmscompat: Make CTS/Play Integrity pass again

patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch

@@ -1,4 +1,4 @@
-From 3f7f3f9546f9f23d66381f7dff887cd562285ce6 Mon Sep 17 00:00:00 2001
+From c93f729acb568f290085cea4014fbe384ec40289 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
@@ -7,6 +7,7 @@ Subject: [PATCH] Messaging: Add "Mark as read" quick action for message
 Change-Id: I7194dca022e5062926fa35709de282721ca64320
 ---
  res/drawable/ic_wear_read.xml                      |  9 +++++++++
+ res/values-zh-rCN/cm_strings.xml                   |  1 +
  res/values/cm_strings.xml                          |  3 +++
  .../messaging/datamodel/BugleNotifications.java    | 14 ++++++++++++++
  .../datamodel/MessageNotificationState.java        |  8 ++++++++
@@ -14,7 +15,7 @@ Change-Id: I7194dca022e5062926fa35709de282721ca64320
  .../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(-)
+ 9 files changed, 82 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
@@ -32,6 +33,17 @@ index 0000000..9d017e6
 +        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-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
+index 3cfebff..f1ffeab 100644
+--- a/res/values-zh-rCN/cm_strings.xml
++++ b/res/values-zh-rCN/cm_strings.xml
+@@ -19,5 +19,6 @@
+     <string name="swipe_to_delete_conversation_pref_summary">向右滑动以删除会话</string>
+     <string name="show_emoticons_pref_title">访问表情符号</string>
+     <string name="show_emoticons_pref_summary">在键盘上显示表情符号键</string>
++    <string name="notification_mark_as_read">标记为已读</string>
+     <string name="notification_channel_messages_title">短信</string>
+ </resources>
 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
 index f285555..858f093 100644
 --- a/res/values/cm_strings.xml
@@ -219,5 +231,5 @@ index d64082d..9281899 100644
       * 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
+2.34.1
 

patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch

@@ -0,0 +1,52 @@
+From 64c0e12dc7a4eb6add7631a84dda17e2012f687c Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 18 Jun 2023 19:33:27 +0800
+Subject: [PATCH 01/21] Add keylayout for Backbone One for Android, with AB/XY
+ keys swapped
+
+Change-Id: Ia057c084099015b544c926cd57c37b4ac314867a
+---
+ data/keyboards/Vendor_358a_Product_0201.kl | 31 ++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+ create mode 100644 data/keyboards/Vendor_358a_Product_0201.kl
+
+diff --git a/data/keyboards/Vendor_358a_Product_0201.kl b/data/keyboards/Vendor_358a_Product_0201.kl
+new file mode 100644
+index 000000000000..e15907f9c6f2
+--- /dev/null
++++ b/data/keyboards/Vendor_358a_Product_0201.kl
+@@ -0,0 +1,31 @@
++#
++# Backbone One for Android
++#
++
++# AB/XY swapped
++key 305 BUTTON_A
++key 304 BUTTON_B
++key 308 BUTTON_X
++key 307 BUTTON_Y
++
++key 310 BUTTON_L1
++key 311 BUTTON_R1
++key 312 BUTTON_L2
++key 313 BUTTON_R2
++
++key 317 BUTTON_THUMBL
++key 318 BUTTON_THUMBR
++
++axis 0x00 X flat 4096
++axis 0x01 Y flat 4096
++axis 0x02 Z flat 4096
++axis 0x05 RZ flat 4096
++
++axis 0x0a LTRIGGER
++axis 0x09 RTRIGGER
++
++axis 0x10 HAT_X
++axis 0x11 HAT_Y
++
++key 315 BUTTON_START
++key 314 BUTTON_SELECT
+-- 
+2.34.1
+

patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch

@@ -1,7 +1,7 @@
-From fe9ef4702e81d02d75fb9e6df73fcf013fb955af Mon Sep 17 00:00:00 2001
+From 2e9df83d63b2c316a6cec6fcbc253ef0919cf5d3 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/20] Add MiuiNavbarOverlay
+Subject: [PATCH 02/21] Add MiuiNavbarOverlay
 
 Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
 ---
@@ -29,7 +29,7 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9
  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
+index 69641e69a9f2..1efc296d9689 100644
 --- a/packages/overlays/Android.mk
 +++ b/packages/overlays/Android.mk
 @@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \

patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch

@@ -1,7 +1,7 @@
-From 964e570909040dc8de452f5269f633c4b4fe9519 Mon Sep 17 00:00:00 2001
+From cf35535a94712e9f81d9532fa4a494a8628b4641 Mon Sep 17 00:00:00 2001
 From: Hikari-no-Tenshi <kyryljan.serhij@gmail.com>
 Date: Thu, 30 Jan 2020 22:20:54 +0200
-Subject: [PATCH 02/20] Disable Bluetooth by default
+Subject: [PATCH 03/21] Disable Bluetooth by default
 
 Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c
 ---

patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch

@@ -1,7 +1,7 @@
-From 0db4a23679a9c74790cc618abeeeadaf0a202665 Mon Sep 17 00:00:00 2001
+From 8201fef9ab532374796549c938ea2fc172bf20f5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 27 Sep 2021 16:30:00 +0000
-Subject: [PATCH 03/20] Disable cursor drag by default for editable TextViews
+Subject: [PATCH 04/21] Disable cursor drag by default for editable TextViews
 
 Requested by @TadiT7
 

patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch

@@ -1,7 +1,7 @@
-From 6a0d86399b5d61301d2184a6b10152462380dc10 Mon Sep 17 00:00:00 2001
+From 0dba3680960846702881fed2b3e716825af92d58 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 3 Jul 2022 00:08:42 +0000
-Subject: [PATCH 04/20] Disable "RESTRICTED bucket" toast
+Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast
 
 Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
 ---
@@ -9,10 +9,10 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8
  1 file changed, 1 insertion(+), 19 deletions(-)
 
 diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
-index a6f47d4e4908..ac7cabba3ddc 100644
+index b27ff411dd58..5ce49bd98c5c 100644
 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
 +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
-@@ -1781,25 +1781,7 @@ public class AppStandbyController
+@@ -1792,25 +1792,7 @@ public class AppStandbyController
                          .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason);
  
                  if (isForcedByUser) {

patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch

@@ -1,7 +1,7 @@
-From 64d1e22f654f996d3cc46334f4a75b6c37c16268 Mon Sep 17 00:00:00 2001
+From c16a1a66b9e311a2dfbf1925d8f17783933571e5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 2 Sep 2021 16:15:19 +0000
-Subject: [PATCH 05/20] Keyguard: Adjust clock style
+Subject: [PATCH 06/21] Keyguard: Adjust clock style
 
 Thinner font, less padding and unintrusive colors
 
@@ -57,26 +57,26 @@ index 000000000000..f80af4376ff1
 +    <color name="clock_default_color_light">@*android:color/primary_text_material_light</color>
 +</resources>
 diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
-index 462b90a10aee..d5fdb185d042 100644
+index 86bd5f2bff5a..b99a8ba487cb 100644
 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
 +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt
-@@ -147,7 +147,7 @@ class AnimatableClockView @JvmOverloads constructor(
+@@ -146,7 +146,7 @@ class AnimatableClockView @JvmOverloads constructor(
      fun refreshTime() {
          time.timeInMillis = timeOverrideInMillis ?: System.currentTimeMillis()
          contentDescription = DateFormat.format(descFormat, time)
 -        val formattedText = DateFormat.format(format, time)
 +        val formattedText = DateFormat.format(format, time).toString() + ' '
-         logBuffer?.log(tag, DEBUG,
+         logBuffer?.log(TAG, DEBUG,
                  { str1 = formattedText?.toString() },
                  { "refreshTime: new formattedText=$str1" }
 diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
-index e138ef8a1ea8..fa7979a0b598 100644
+index 4df7a44d3e1d..447160a8cb63 100644
 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
 +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt
-@@ -131,9 +131,9 @@ class DefaultClockController(
+@@ -143,9 +143,9 @@ class DefaultClockController(
-         fun updateColor() {
+                 if (seedColor != null) {
-             val color =
+                     seedColor!!
-                 if (isRegionDark) {
+                 } else if (isRegionDark) {
 -                    resources.getColor(android.R.color.system_accent1_100)
 +                    resources.getColor(R.color.clock_default_color_dark)
                  } else {
@@ -99,10 +99,10 @@ index 7c5dbc247428..64657547621f 100644
      />
  </com.android.keyguard.KeyguardSliceView>
 diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
-index c5ffdc0051da..b3f3d46c5dcd 100644
+index edd6eff92c1c..14df77dc4a4e 100644
 --- a/packages/SystemUI/res-keyguard/values/dimens.xml
 +++ b/packages/SystemUI/res-keyguard/values/dimens.xml
-@@ -94,10 +94,10 @@
+@@ -91,10 +91,10 @@
      <dimen name="num_pad_key_margin_end">12dp</dimen>
  
      <!-- additional offset for clock switch area items -->
@@ -143,10 +143,10 @@ index 8b8594032816..9135e78f3e4c 100644
          android:singleLine="true"
          systemui:showMissingSim="true"
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index dfc6ba4720f2..6c5e6d73feb7 100644
+index 892c2f4caa39..6996e41e08da 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
-@@ -301,7 +301,7 @@
+@@ -302,7 +302,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>
@@ -155,7 +155,7 @@ index dfc6ba4720f2..6c5e6d73feb7 100644
          <item name="android:colorError">@*android:color/error_color_material_dark</item>
          <item name="*android:lockPatternStyle">@style/LockPatternViewStyle</item>
          <item name="lockPatternStyle">@style/LockPatternContainerStyle</item>
-@@ -323,7 +323,7 @@
+@@ -324,7 +324,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>

patches_platform_personal/frameworks_base/0007-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch

@@ -1,7 +1,7 @@
-From abc2207876e23d1c01e0c45fe604dcef3967e1b7 Mon Sep 17 00:00:00 2001
+From c9d2af70d90a8cf81dae5bfba93d6f59c0373bdb Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 2 Nov 2019 06:41:03 +0000
-Subject: [PATCH 06/20] Keyguard: Hide padlock unless UDFPS is in use
+Subject: [PATCH 07/21] Keyguard: Hide padlock unless UDFPS is in use
 
 Fair enough Google, but don't give me that otherwise
 
@@ -11,7 +11,7 @@ Change-Id: Ie91e80ca5c6637a51a8acc72fb28cd6ac2a7abb6
  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 1322f16a5a59..3df030b50ed5 100644
+index 0887b220dee1..423549dd3ab2 100644
 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
 @@ -295,20 +295,14 @@ public class LockIconViewController extends ViewController<LockIconView> impleme

patches_platform_personal/frameworks_base/0008-Keyguard-Never-switch-to-large-clock.patch

@@ -1,7 +1,7 @@
-From 86a90de31bc9c05b3124d573dcd93eb5a3ddf5ec Mon Sep 17 00:00:00 2001
+From ff1164da64003d5a6d6e57fd75ba1d8684167dd7 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 1 Sep 2021 14:41:53 +0000
-Subject: [PATCH 07/20] Keyguard: Never switch to large clock
+Subject: [PATCH 08/21] Keyguard: Never switch to large clock
 
 It looks alright actually, but as always breaks under landscape
 
@@ -11,10 +11,10 @@ Change-Id: I434d033ecae597ed2a7b2ed71e96ba1a963e9cc3
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-index 788f1200d603..45d045785e2d 100644
+index ba217804c96e..ab3391372e2c 100644
 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
 +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
-@@ -392,7 +392,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
+@@ -470,7 +470,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
  
      private void updateDoubleLineClock() {
          mCanShowDoubleLineClock = mSecureSettings.getIntForUser(

patches_platform_personal/frameworks_base/0009-Keyguard-Refine-indication-text.patch

@@ -1,17 +1,17 @@
-From 6254335e8e470501a24b678aa006536fadd0f7c0 Mon Sep 17 00:00:00 2001
+From a8a951832a14ed9fb5e718a14c4dc9ec73d24693 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 2 Nov 2019 08:31:36 +0000
-Subject: [PATCH 08/20] Keyguard: Refine indication text
+Subject: [PATCH 09/21] Keyguard: Refine indication text
 
 Change-Id: Ib771c35610f712a1de34736e817bcfe616ac37d8
 ---
  .../SystemUI/res-keyguard/values/styles.xml   |  2 --
  .../res/layout/keyguard_bottom_area.xml       |  1 +
  packages/SystemUI/res/values/dimens.xml       |  3 +--
- ...ardIndicationRotateTextViewController.java | 12 +++++++++-
+ ...ardIndicationRotateTextViewController.java | 12 ++++++++++-
- .../KeyguardIndicationController.java         | 23 ++++---------------
+ .../KeyguardIndicationController.java         | 21 ++-----------------
  .../phone/KeyguardIndicationTextView.java     |  2 +-
- 6 files changed, 18 insertions(+), 25 deletions(-)
+ 6 files changed, 16 insertions(+), 25 deletions(-)
 
 diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
 index c81e018702bb..cc87f9f3d7cf 100644
@@ -27,7 +27,7 @@ index c81e018702bb..cc87f9f3d7cf 100644
  
      <style name="TextAppearance.Keyguard.BottomArea.Button">
 diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
-index 6120863f23ab..5fd81bad8226 100644
+index 4048a39344bd..2f884baf0bd5 100644
 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
 +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
 @@ -35,6 +35,7 @@
@@ -39,10 +39,10 @@ index 6120863f23ab..5fd81bad8226 100644
              android:paddingEnd="@dimen/keyguard_indication_text_padding"
              android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 1165c0d1eda1..750fb574c30c 100644
+index ceebab2b08ef..e2c65f5542b7 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -774,11 +774,10 @@
+@@ -815,11 +815,10 @@
      <dimen name="keyguard_lock_height">42dp</dimen>
      <dimen name="keyguard_lock_padding">20dp</dimen>
  
@@ -56,10 +56,10 @@ index 1165c0d1eda1..750fb574c30c 100644
      <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 9235e10209d4..42e710d9c9a3 100644
+index 0745456b3e43..0fc0b9e29fb7 100644
 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
 +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java
-@@ -220,12 +220,22 @@ public class KeyguardIndicationRotateTextViewController extends
+@@ -224,12 +224,22 @@ public class KeyguardIndicationRotateTextViewController extends
      }
  
      /**
@@ -84,23 +84,10 @@ index 9235e10209d4..42e710d9c9a3 100644
       * 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 3301d6907a25..15a7555e1381 100644
+index 2b3444e64acb..b8567d17785a 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
-@@ -270,10 +270,12 @@ public class KeyguardIndicationController {
+@@ -407,7 +407,6 @@ 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());
-                 } else if (msg.what == MSG_RESET_ERROR_MESSAGE_ON_SCREEN_ON) {
-                     mBiometricErrorMessageToShowOnScreenOn = null;
-                 }
-@@ -377,7 +379,6 @@ public class KeyguardIndicationController {
          updateLockScreenDisclosureMsg();
          updateLockScreenOwnerInfo();
          updateLockScreenBatteryMsg(animate);
@@ -108,7 +95,7 @@ index 3301d6907a25..15a7555e1381 100644
          updateLockScreenTrustMsg(userId, getTrustGrantedIndication(), getTrustManagedIndication());
          updateLockScreenAlignmentMsg();
          updateLockScreenLogoutView();
-@@ -486,22 +487,6 @@ public class KeyguardIndicationController {
+@@ -518,22 +517,6 @@ public class KeyguardIndicationController {
          }
      }
  
@@ -131,7 +118,7 @@ index 3301d6907a25..15a7555e1381 100644
      private void updateBiometricMessage() {
          if (mDozing) {
              updateDeviceEntryIndication(false);
-@@ -594,11 +579,11 @@ public class KeyguardIndicationController {
+@@ -626,11 +609,11 @@ public class KeyguardIndicationController {
      }
  
      private void updateLockScreenPersistentUnlockMsg() {
@@ -146,7 +133,7 @@ index 3301d6907a25..15a7555e1381 100644
                              .build(),
                      true);
 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 d24469e8421e..647c766aa0f0 100644
+index 9d30cb4c4852..f179194fb0e1 100644
 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java
 @@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView {

patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch

@@ -1,7 +1,7 @@
-From 4eebadc9bacc35b94ac2fec83e68b4fd0a6eab21 Mon Sep 17 00:00:00 2001
+From 0425dac4b2f22dc37e117b55a0fdefe91f6e2ebb Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 20 Mar 2021 10:35:14 +0000
-Subject: [PATCH 09/20] Keyguard/UI: Fix status bar / quick settings margins
+Subject: [PATCH 10/21] Keyguard/UI: Fix status bar / quick settings margins
  and paddings
 
 Last revised on 2023/03/22, targeting T QPR2
@@ -25,16 +25,16 @@ Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7
  packages/SystemUI/res/values-sw600dp/dimens.xml        |  3 ---
  packages/SystemUI/res/values/dimens.xml                |  2 +-
  packages/SystemUI/res/xml/qqs_header.xml               |  4 ++--
- .../systemui/shade/LargeScreenShadeHeaderController.kt | 10 +++++++---
+ .../android/systemui/shade/ShadeHeaderController.kt    | 10 +++++++---
  .../statusbar/phone/KeyguardStatusBarView.java         |  7 -------
  7 files changed, 12 insertions(+), 18 deletions(-)
 
 diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml
-index 4b78f2839255..7ac024a97eee 100644
+index 828a4535e656..65c8e52d00ac 100644
 --- a/packages/SystemUI/res/layout/combined_qs_header.xml
 +++ b/packages/SystemUI/res/layout/combined_qs_header.xml
-@@ -148,4 +148,4 @@
+@@ -151,4 +151,4 @@
-         <include layout="@layout/ongoing_privacy_chip"/>
+ 
      </FrameLayout>
  
 -</com.android.systemui.util.NoRemeasureMotionLayout>
@@ -54,24 +54,24 @@ index 9135e78f3e4c..ddaea938c858 100644
          android:gravity="center_vertical"
          android:ellipsize="marquee"
 diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
-index 599bf30a5135..f9911fda7dbe 100644
+index 59becc69506c..9168a5ce1ced 100644
 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml
 +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
-@@ -27,9 +27,6 @@
+@@ -28,9 +28,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. -->
+     <!-- Screen pinning request width -->
-     <dimen name="keyguard_affordance_height">80dp</dimen>
+     <dimen name="screen_pinning_request_width">400dp</dimen>
-     <dimen name="keyguard_affordance_width">120dp</dimen>
+     <!-- Screen pinning request bottom button circle widths -->
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 750fb574c30c..b5854568c117 100644
+index e2c65f5542b7..d0a9055e1905 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -748,7 +748,7 @@
+@@ -790,7 +790,7 @@
      <dimen name="kg_framed_avatar_size">32dp</dimen>
  
      <!-- Margin on the left side of the carrier text on Keyguard -->
@@ -81,7 +81,7 @@ index 750fb574c30c..b5854568c117 100644
      <!-- Additional translation (downwards) for appearing notifications when going to the full shade
           from Keyguard. -->
 diff --git a/packages/SystemUI/res/xml/qqs_header.xml b/packages/SystemUI/res/xml/qqs_header.xml
-index e56e5d557c2f..6378705f9db4 100644
+index 00a0444a1c9d..a5c3f8e982ca 100644
 --- a/packages/SystemUI/res/xml/qqs_header.xml
 +++ b/packages/SystemUI/res/xml/qqs_header.xml
 @@ -44,7 +44,7 @@
@@ -93,29 +93,29 @@ index e56e5d557c2f..6378705f9db4 100644
              app:layout_constrainedWidth="true"
              app:layout_constraintStart_toEndOf="@id/clock"
              app:layout_constraintEnd_toStartOf="@id/barrier"
-@@ -110,4 +110,4 @@
+@@ -109,4 +109,4 @@
              app:layout_constraintHorizontal_bias="1"
          />
      </Constraint>
 -</ConstraintSet>
 \ No newline at end of file
 +</ConstraintSet>
-diff --git a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
+diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
-index a3dffa2ec4d8..dca955008ad3 100644
+index a6b88370f836..e7632971d37e 100644
---- a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
+--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
-+++ b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt
++++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
-@@ -140,6 +140,8 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -132,6 +132,8 @@ constructor(
-     private var cutoutLeft = 0
+ 
-     private var cutoutRight = 0
      private var roundedCorners = 0
+     private var cutout: DisplayCutout? = null
 +    private var statusBarPaddingStart = 0
 +    private var statusBarPaddingEnd = 0
      private var lastInsets: WindowInsets? = null
      private var textColorPrimary = Color.TRANSPARENT
  
-@@ -376,14 +378,17 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -364,14 +366,17 @@ constructor(
-         cutoutLeft = sbInsets.first
+         val cutoutLeft = sbInsets.first
-         cutoutRight = sbInsets.second
+         val cutoutRight = sbInsets.second
          val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout()
 +        roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding)
 +        statusBarPaddingStart = resources.getDimensionPixelSize(R.dimen.status_bar_padding_start)
@@ -123,8 +123,8 @@ index a3dffa2ec4d8..dca955008ad3 100644
          updateQQSPaddings()
          // Set these guides as the left/right limits for content that lives in the top row, using
          // cutoutLeft and cutoutRight
-         var changes = combinedShadeHeadersConstraintManager
+         var changes =
-             .edgesGuidelinesConstraints(
+             combinedShadeHeadersConstraintManager.edgesGuidelinesConstraints(
 -                if (view.isLayoutRtl) cutoutRight else cutoutLeft,
 +                (if (view.isLayoutRtl) cutoutRight else cutoutLeft) + statusBarPaddingStart,
                  header.paddingStart,
@@ -133,7 +133,7 @@ index a3dffa2ec4d8..dca955008ad3 100644
                  header.paddingEnd
              )
  
-@@ -502,7 +507,6 @@ class LargeScreenShadeHeaderController @Inject constructor(
+@@ -483,7 +488,6 @@ constructor(
      }
  
      private fun updateResources() {

patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch

@@ -1,7 +1,7 @@
-From 29973bff7d5cad945ec8cb4b378d4d099b2ccf6e Mon Sep 17 00:00:00 2001
+From 4803ddab6f362587e769b2aa5d60a041345d26af Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 31 May 2022 00:00:08 +0000
-Subject: [PATCH 10/20] Revert "SystemUI: Add left padding for keyguard slices"
+Subject: [PATCH 11/21] Revert "SystemUI: Add left padding for keyguard slices"
 
 This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896.
 ---

patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch

@@ -1,7 +1,7 @@
-From 88e5979f1265f85901bf38ad7072b61a0ed1321b Mon Sep 17 00:00:00 2001
+From f5ad15c1785d0a458bc2be47f0ef2a8d5283ae86 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 5 Sep 2021 01:20:12 +0000
-Subject: [PATCH 11/20] Revert "Update RAT icons to match Silk design"
+Subject: [PATCH 12/21] Revert "Update RAT icons to match Silk design"
 
 This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248.
 ---

patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch

@@ -1,7 +1,7 @@
-From 9ca4c9ed59f2d710e2ed65d266c346f6c76bf06d Mon Sep 17 00:00:00 2001
+From 15e59be158a3305a17e14cc18883d323d2afc54b Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Thu, 29 Sep 2022 11:27:57 +0000
-Subject: [PATCH 12/20] Revert "Use the default top clock margin on h800
+Subject: [PATCH 13/21] Revert "Use the default top clock margin on h800
  devices"
 
 This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd

patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch

@@ -1,7 +1,7 @@
-From b4f02e5a5d70915148a826fd5adbc80005c2d893 Mon Sep 17 00:00:00 2001
+From 6927e68fa4ec001ec72e9f68e4454a37c8bc7bb5 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 7 Oct 2020 14:00:35 +0000
-Subject: [PATCH 13/20] UI: Always render windows into cutouts
+Subject: [PATCH 14/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
@@ -52,10 +52,10 @@ index 33641f72b2ff..6e201970ac03 100644
      }
  
 diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
-index ebeb189000a3..5c4cde643e82 100644
+index 1468360b37b7..a1f70e4c8deb 100644
 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java
 +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
-@@ -1550,6 +1550,7 @@ public class DisplayPolicy {
+@@ -1558,6 +1558,7 @@ public class DisplayPolicy {
          displayFrames = win.getDisplayFrames(displayFrames);
  
          final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation);

patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch

@@ -1,7 +1,7 @@
-From b780aa348b0807a89c393330d2727b5d69c59238 Mon Sep 17 00:00:00 2001
+From 89c565bf1a9ce56a64191059424bf9f5fe04f1d9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 1 Sep 2021 14:10:50 +0000
-Subject: [PATCH 14/20] UI: Kill rounded corners in notification scrim
+Subject: [PATCH 15/21] UI: Kill rounded corners in notification scrim
 
 Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place
 
@@ -11,10 +11,10 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index b5854568c117..1d6a7dd284a5 100644
+index d0a9055e1905..30881992795d 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -684,7 +684,7 @@
+@@ -726,7 +726,7 @@
      <!-- With the large clock, move up slightly from the center -->
      <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>
  

patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch

@@ -1,7 +1,7 @@
-From 7e764a4f7f2314bbaf5d7271115be30baa46e893 Mon Sep 17 00:00:00 2001
+From be2477f3314d044e1d7581905a4d358aa0f0a2a7 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Mon, 26 Oct 2020 14:06:56 +0000
-Subject: [PATCH 15/20] UI: Reconfigure power menu items
+Subject: [PATCH 16/21] UI: Reconfigure power menu items
 
 Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
 ---
@@ -9,10 +9,10 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
-index 8f81427cbe67..349ff65ecde6 100644
+index 87e3ddcf8fdf..64d592b2230b 100644
 --- a/core/res/res/values/config.xml
 +++ b/core/res/res/values/config.xml
-@@ -3252,13 +3252,10 @@
+@@ -3305,13 +3305,10 @@
           "logout" =  Logout the current user
           -->
      <string-array translatable="false" name="config_globalActionsList">

patches_platform_personal/frameworks_base/0017-UI-Reconfigure-quick-settings-tiles.patch

@@ -1,7 +1,7 @@
-From dbbe5afc40f68420da0e808c89b34f284b09f8d9 Mon Sep 17 00:00:00 2001
+From f22928416285a9ac0ab6f8cd683c8dd5d95bf15b Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 5 Mar 2022 01:43:37 +0000
-Subject: [PATCH 16/20] UI: Reconfigure quick settings tiles
+Subject: [PATCH 17/21] UI: Reconfigure quick settings tiles
 
 Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
 ---
@@ -9,7 +9,7 @@ Change-Id: I743f52ef3a95db0ca2c02ae973faa4629e41885d
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
-index 70269b18a573..38b654b64418 100644
+index 418bbc7c7932..245bde4c543a 100644
 --- a/packages/SystemUI/res/values/config.xml
 +++ b/packages/SystemUI/res/values/config.xml
 @@ -68,7 +68,7 @@

patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch

@@ -1,7 +1,7 @@
-From 07b9d619fefc8b722dd154e0cf68249b3d9fffe2 Mon Sep 17 00:00:00 2001
+From fe8362152cdb0a17376ffedb37030cc57d14b375 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 29 Jun 2021 22:57:01 +0000
-Subject: [PATCH 17/20] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
+Subject: [PATCH 18/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT
 
 I decide what's good enough for a wallpaper!
 
@@ -11,10 +11,10 @@ Change-Id: I5ccd85b3df12e53746a4ac6cbc37ba8d11f6c336
  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
+index a34a50c4b7b0..028f77fb21b0 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 {
+@@ -580,7 +580,7 @@ public final class WallpaperColors implements Parcelable {
  
          int hints = 0;
          double meanLuminance = totalLuminance / pixels.length;

patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch

@@ -1,7 +1,7 @@
-From 6d5e98d6f14462e0921eee4b223dcce4daa47b73 Mon Sep 17 00:00:00 2001
+From a0cd4caf1cd92218e44db206ec2f67839ce4dbe8 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 19 Oct 2021 12:09:34 +0000
-Subject: [PATCH 18/20] UI: Remove privacy dot
+Subject: [PATCH 19/21] UI: Remove privacy dot
 
 Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
 ---
@@ -9,10 +9,10 @@ Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
-index 1d6a7dd284a5..0ebbcdb16f79 100644
+index 30881992795d..7ead38868815 100644
 --- a/packages/SystemUI/res/values/dimens.xml
 +++ b/packages/SystemUI/res/values/dimens.xml
-@@ -1014,12 +1014,12 @@
+@@ -1059,12 +1059,12 @@
      <dimen name="ongoing_appops_chip_min_width">56dp</dimen>
      <!--  Three privacy items. This value must not be exceeded  -->
      <dimen name="ongoing_appops_chip_max_width">76dp</dimen>

patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch

@@ -1,7 +1,7 @@
-From 31ed8c48f604dbab1f0097737886fb800929c101 Mon Sep 17 00:00:00 2001
+From 7cacf0df0092432cd2347e0cbae0c1c3d0f5dcf9 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Wed, 22 Mar 2023 00:29:13 +0000
-Subject: [PATCH 19/20] UI: Restore quick settings fonts to pre-T-QPR2
+Subject: [PATCH 20/21] UI: Restore quick settings fonts to pre-T-QPR2
 
 TODO: Large header clock looks better in Regular - perhaps figure out how to transition smoothly?
 Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
@@ -10,7 +10,7 @@ Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
-index 6c5e6d73feb7..1bbd930443a2 100644
+index 6996e41e08da..5e6d45ac9305 100644
 --- a/packages/SystemUI/res/values/styles.xml
 +++ b/packages/SystemUI/res/values/styles.xml
 @@ -134,7 +134,7 @@

patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch

@@ -1,7 +1,7 @@
-From be2c9c3bfaac6b3b9fc705ceb3799decc99d5a3d Mon Sep 17 00:00:00 2001
+From 9732bf6c88d489f587e62d9f6b382e876295cbd6 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Fri, 30 Sep 2022 16:02:16 +0000
-Subject: [PATCH 20/20] UI: Revert to HSL luminance for wallpaper dark hints
+Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints
 
 Y U no test for consistency, Google?
 
@@ -11,10 +11,10 @@ Change-Id: Ie5663bdf518b4ef93d6deb634e707a32d052ac55
  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
+index 028f77fb21b0..63ccf961a2d8 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 {
+@@ -555,15 +555,15 @@ public final class WallpaperColors implements Parcelable {
          float[] tmpHsl = new float[3];
          for (int i = 0; i < pixels.length; i++) {
              int pixelColor = pixels[i];
@@ -33,7 +33,7 @@ index a8d3c14e1d9d..88609f3d7052 100644
  
              // 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 {
+@@ -575,7 +575,7 @@ public final class WallpaperColors implements Parcelable {
                      pixels[i] = Color.RED;
                  }
              }

patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Remove-night-mode.patch

@@ -1,28 +1,29 @@
-From 8ffb863199ed6e09068a41aa8e701732bed271e6 Mon Sep 17 00:00:00 2001
+From ef3810b1d55f079278f3ac3ef83f7b5b2eaaa7c1 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sun, 5 Sep 2021 00:30:33 +0000
-Subject: [PATCH 3/5] DeskClock: Remove night mode
+Subject: [PATCH 2/4] DeskClock: Remove night mode
 
 Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
 ---
- res/xml/screensaver_settings.xml                   | 6 ------
+ res/xml/screensaver_settings.xml                   | 7 -------
  src/com/android/deskclock/Screensaver.java         | 5 ++---
  src/com/android/deskclock/ScreensaverActivity.java | 2 +-
- 3 files changed, 3 insertions(+), 10 deletions(-)
+ 3 files changed, 3 insertions(+), 11 deletions(-)
 
 diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml
-index 49a7f1d89..73375dcfa 100644
+index 7b8c9764a..908f76fef 100644
 --- a/res/xml/screensaver_settings.xml
 +++ b/res/xml/screensaver_settings.xml
-@@ -24,10 +24,4 @@
+@@ -26,11 +26,4 @@
-         android:key="screensaver_clock_style"
+         android:title="@string/clock_style"
-         android:title="@string/clock_style" />
+         app:iconSpaceReserved="false" />
  
 -    <CheckBoxPreference
 -        android:defaultValue="true"
 -        android:key="screensaver_night_mode"
 -        android:summary="@string/night_mode_summary"
--        android:title="@string/night_mode_title" />
+-        android:title="@string/night_mode_title"
+-        app:iconSpaceReserved="false" />
 -
  </PreferenceScreen>
 diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java

patches_platform_personal/packages_apps_DeskClock/0002-Revert-DeskClock-update-digital-widget.patch

@@ -1,156 +0,0 @@
-From 7ee7d93a6596567c0b799ba00091db3950b83fe0 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sun, 7 May 2023 14:24:32 +0000
-Subject: [PATCH 2/5] Revert "DeskClock: update digital widget"
-
-This reverts commit a9e6a18d1abd5f3ee2ec816d031f2a69ea1f6028.
----
- res/layout/digital_widget.xml       | 5 +++--
- res/layout/digital_widget_sizer.xml | 5 +++--
- res/values-h560dp/dimens.xml        | 2 +-
- res/values-h650dp/dimens.xml        | 2 +-
- res/values-sw600dp-land/dimens.xml  | 2 +-
- res/values-sw600dp/dimens.xml       | 2 +-
- res/values-sw720dp/dimens.xml       | 2 +-
- res/values/dimens.xml               | 2 +-
- res/values/styles.xml               | 6 ++----
- 9 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
-index d09cba64c..5cf896a84 100644
---- a/res/layout/digital_widget.xml
-+++ b/res/layout/digital_widget.xml
-@@ -24,7 +24,7 @@
- 
-     <TextClock
-         android:id="@+id/clock"
--        style="@style/widget_big"
-+        style="@style/widget_big_thin"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_gravity="center_horizontal|top"
-@@ -32,7 +32,8 @@
-         android:format12Hour="@string/lock_screen_12_hour_format"
-         android:format24Hour="@string/lock_screen_24_hour_format"
-         android:includeFontPadding="false"
--        android:singleLine="true" />
-+        android:singleLine="true"
-+        android:textColor="@color/white" />
- 
-     <LinearLayout
-         android:layout_width="wrap_content"
-diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
-index be7677ba7..f524cf536 100644
---- a/res/layout/digital_widget_sizer.xml
-+++ b/res/layout/digital_widget_sizer.xml
-@@ -21,7 +21,7 @@
- 
-     <TextClock
-         android:id="@+id/clock"
--        style="@style/widget_big"
-+        style="@style/widget_big_thin"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_gravity="center_horizontal|top"
-@@ -29,7 +29,8 @@
-         android:ellipsize="none"
-         android:format12Hour="@string/lock_screen_12_hour_format"
-         android:format24Hour="@string/lock_screen_24_hour_format"
--        android:singleLine="true" />
-+        android:singleLine="true"
-+        android:textColor="@color/white" />
- 
-     <LinearLayout
-         android:layout_width="wrap_content"
-diff --git a/res/values-h560dp/dimens.xml b/res/values-h560dp/dimens.xml
-index 403e19f93..7bf0909b1 100644
---- a/res/values-h560dp/dimens.xml
-+++ b/res/values-h560dp/dimens.xml
-@@ -16,5 +16,5 @@
- 
- <resources>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">86dp</dimen>
-+    <dimen name="widget_max_clock_font_size">96dp</dimen>
- </resources>
-diff --git a/res/values-h650dp/dimens.xml b/res/values-h650dp/dimens.xml
-index de043fd26..7c52196c0 100644
---- a/res/values-h650dp/dimens.xml
-+++ b/res/values-h650dp/dimens.xml
-@@ -16,5 +16,5 @@
- 
- <resources>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">90dp</dimen>
-+    <dimen name="widget_max_clock_font_size">100dp</dimen>
- </resources>
-diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
-index f647ef5b4..157e8b4ba 100644
---- a/res/values-sw600dp-land/dimens.xml
-+++ b/res/values-sw600dp-land/dimens.xml
-@@ -24,5 +24,5 @@
-     <dimen name="analog_clock_margin">48dp</dimen>
- 
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">90dp</dimen>
-+    <dimen name="widget_max_clock_font_size">100dp</dimen>
- </resources>
-diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
-index bde6b225c..2c3a50de6 100644
---- a/res/values-sw600dp/dimens.xml
-+++ b/res/values-sw600dp/dimens.xml
-@@ -63,5 +63,5 @@
-     <!-- The fixed size of the font for the city name / day of week in the city widget. -->
-     <dimen name="city_widget_name_font_size">20dp</dimen>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">112dp</dimen>
-+    <dimen name="widget_max_clock_font_size">125dp</dimen>
- </resources>
-diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
-index 8b786f0e9..92f495a76 100644
---- a/res/values-sw720dp/dimens.xml
-+++ b/res/values-sw720dp/dimens.xml
-@@ -22,5 +22,5 @@
-     <dimen name="analog_clock_size">312dp</dimen>
- 
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">124dp</dimen>
-+    <dimen name="widget_max_clock_font_size">138dp</dimen>
- </resources>
-diff --git a/res/values/dimens.xml b/res/values/dimens.xml
-index c26d93ddd..c136fe25a 100644
---- a/res/values/dimens.xml
-+++ b/res/values/dimens.xml
-@@ -95,7 +95,7 @@
-     <!-- The fixed size of the font for the city name / day of week in the city widget. -->
-     <dimen name="city_widget_name_font_size">10dp</dimen>
-     <!-- The maximum size of the font for the time in widgets. -->
--    <dimen name="widget_max_clock_font_size">80dp</dimen>
-+    <dimen name="widget_max_clock_font_size">88dp</dimen>
-     <dimen name="widget_min_world_city_list_size">80dp</dimen>
- 
-     <!-- shadow styles for widget text with drop shadows -->
-diff --git a/res/values/styles.xml b/res/values/styles.xml
-index 683df4ee5..8c6364344 100644
---- a/res/values/styles.xml
-+++ b/res/values/styles.xml
-@@ -72,14 +72,12 @@
-         <item name="android:fontFamily">sans-serif-thin</item>
-     </style>
- 
--    <style name="widget_big" parent="big_thin">
-+    <style name="widget_big_thin" parent="big_thin">
-         <item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
-         <item name="android:shadowColor">@color/widget_shadow_color</item>
-         <item name="android:shadowDx">@dimen/widget_shadow_dx</item>
-         <item name="android:shadowDy">@dimen/widget_shadow_dy</item>
--        <item name="android:fontFamily">sans-serif-condensed</item>
--        <item name="android:textColor">@*android:color/system_accent2_100</item>
--        <item name="android:scaleY">0.9</item>
-+        <item name="android:fontFamily">sans-serif-thin</item>
-     </style>
- 
-     <style name="PrimaryLabelTextParentAppearance">
--- 
-2.34.1
-

patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Adapt-digital-clocks-to-S-style.patch

@@ -1,7 +1,7 @@
-From acb86d43b61a02dbad16bd56a2a0bc3f770b46f9 Mon Sep 17 00:00:00 2001
+From 3430de2c592c9d9b4a08c16477fff4ad1a4ca775 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 4/5] DeskClock: Adapt digital clocks to S style
+Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style
 
 Lollipop is so yesterday...
 Bring the layouts of various digital clocks (app, widget, daydream)

patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch

@@ -1,7 +1,7 @@
-From cb345f3431711b6df77eadfe88cee2101d34bea3 Mon Sep 17 00:00:00 2001
+From 169570068c3a78f7294d581b2df864ccd3057579 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 5/5] DeskClock: Wallpaper-based text coloring for digital
+Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital
  clock widget
 
 RemoteViews is such a restrictive PITA

patches_platform_personal/packages_apps_Trebuchet/0001-Trebuchet-Make-overview-scrim-transparent-again.patch

@@ -1,4 +1,4 @@
-From 1f218b4e6572822d99ec46c1bfd65e7ff023c0d3 Mon Sep 17 00:00:00 2001
+From f32dde0ff88ec58029be1fe4a1b42b94ff1bdbab 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
@@ -7,18 +7,18 @@ Also revert texts/buttons to workspace color
 
 Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
 ---
- quickstep/res/values/styles.xml                            | 4 ++--
+ quickstep/res/values/styles.xml                            | 2 +-
  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(-)
+ 5 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
-index 7225220876..59cce932a2 100644
+index 8eea37f6c2..623f60f81a 100644
 --- a/quickstep/res/values/styles.xml
 +++ b/quickstep/res/values/styles.xml
-@@ -142,7 +142,7 @@
+@@ -176,7 +176,7 @@
          parent="@android:style/Widget.DeviceDefault.Button.Borderless">
          <item name="android:textColor">@color/overview_button</item>
          <item name="android:drawableTint">@color/overview_button</item>
@@ -27,18 +27,11 @@ index 7225220876..59cce932a2 100644
          <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
+index 9222e456e5..678c0dfd80 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
+@@ -783,7 +783,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();
@@ -89,5 +82,5 @@ index aa48b78604..e638ac2d4a 100644
 \ No newline at end of file
 +</selector>
 -- 
-2.25.1
+2.34.1
 

patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch

@@ -1,4 +1,4 @@
-From 3b51af674b9aa916e86fcfe0034ba3dfc0359ae1 Mon Sep 17 00:00:00 2001
+From c04fae6b45b624a39d684c4b6cf02440a3fe83b5 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
@@ -13,14 +13,14 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153
  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
+index 847114a960..eef4be2964 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,
+@@ -419,14 +419,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
              nonOverviewAnim.setFloatValues(startProgress, endProgress);
              mNonOverviewAnim.dispatchOnStart();
          }
--        if (targetState == QUICK_SWITCH) {
+-        if (targetState == QUICK_SWITCH_FROM_HOME) {
 -            // Navigating to quick switch, add scroll feedback since the first time is not
 -            // considered a scroll by the RecentsView.
 -            VibratorWrapper.INSTANCE.get(mLauncher).vibrate(
@@ -32,10 +32,10 @@ index 53dc9dd873..c8d89edb97 100644
          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
+index eddc50c64f..09f253b08d 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>
+@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
          mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                  velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
                  mEndDisplacement, animationDuration);
@@ -48,10 +48,10 @@ index ca7f633bbc..61ee609535 100644
  
      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
+index 678c0dfd80..8e75a7c18d 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
+@@ -1466,25 +1466,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
          }
      }
  
@@ -78,5 +78,5 @@ index 58e8c2508a..786db49be5 100644
      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
+2.34.1
 

patches_treble/packages_apps_Settings/0001-TrebleSettings-Screen-resolution-refresh-rate.patch

@@ -1,4 +1,4 @@
-From 3ba16df7f4274056ce2d453ff5064cfdb71b77f6 Mon Sep 17 00:00:00 2001
+From 67b3720b1972d7290e93a9369b9a319583bba482 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/8] TrebleSettings: Screen resolution & refresh rate
@@ -6,14 +6,14 @@ Subject: [PATCH 1/8] TrebleSettings: Screen resolution & refresh rate
 Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec
 ---
  AndroidManifest.xml                           |   8 +
- res/drawable/ic_settings_treble.xml           |  10 ++
+ res/drawable/ic_settings_treble.xml           |  10 +
  res/values/menu_keys.xml                      |   1 +
- res/values/strings.xml                        |  10 ++
+ res/values/strings.xml                        |  10 +
  res/xml/top_level_settings.xml                |   9 +
  res/xml/treble_settings.xml                   |  18 ++
- ...lutionRefreshRatePreferenceController.java | 169 ++++++++++++++++++
+ ...lutionRefreshRatePreferenceController.java | 173 ++++++++++++++++++
  .../settings/treble/TrebleSettings.java       |  39 ++++
- 8 files changed, 264 insertions(+)
+ 8 files changed, 268 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
@@ -133,10 +133,10 @@ index 0000000000..1a82c468a2
 +</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
+index 0000000000..35d67f2da1
 --- /dev/null
 +++ b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,173 @@
 +package com.android.settings.treble;
 +
 +import static android.content.Intent.ACTION_BOOT_COMPLETED;
@@ -235,8 +235,12 @@ index 0000000000..5d14f13209
 +    public void updateState(Preference preference) {
 +        int id = SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).activeDisplayModeId;
 +        int index = mListPreference.findIndexOfValue(String.valueOf(id));
-+        mListPreference.setValueIndex(index);
++        try {
-+        mListPreference.setSummary(mListPreference.getEntries()[index]);
++            mListPreference.setValueIndex(index);
++            mListPreference.setSummary(mListPreference.getEntries()[index]);
++        } catch (ArrayIndexOutOfBoundsException e) {
++            e.printStackTrace();
++        }
 +    }
 +
 +    @Override

patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch

@@ -1,4 +1,4 @@
-From 7f38cb8576433a221970b5dc3947c7a2bb99595a Mon Sep 17 00:00:00 2001
+From 5e8b0836fb7eff4ea034ce5b9981ce9e9971ec4b 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/8] TrebleSettings: Basic audio and display fixes

patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch

@@ -1,4 +1,4 @@
-From 6a913538449ff2097b6f360554f8449ebe781ace Mon Sep 17 00:00:00 2001
+From 25ef7392032f02607cbaab2165927d4c3f45368f 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/8] TrebleSettings: IMS

patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch

@@ -1,4 +1,4 @@
-From dd2d72d6b43693ea5c67eef3ab49aae29b63ae8d Mon Sep 17 00:00:00 2001
+From 944adfb3d9a4f18bdda1e92b80f720bb33aed0eb Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 10 Dec 2022 12:04:37 +0000
 Subject: [PATCH 4/8] TrebleSettings: Disable A2DP offload

patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch

@@ -1,4 +1,4 @@
-From ac0bdd1f060115d00762a4d29c214fce2e41e960 Mon Sep 17 00:00:00 2001
+From 08b78bde66809487d882ebb101d379d5de808af4 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 10 Dec 2022 14:16:50 +0000
 Subject: [PATCH 5/8] TrebleSettings: Alternative audio jack detection

patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch

@@ -1,4 +1,4 @@
-From ed12a1c194aaf80b4c466fbca43bd846fc03137b Mon Sep 17 00:00:00 2001
+From e87ca51ba6e4bcdb29449e3bd896a2d7166bad7a Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 17 Dec 2022 10:29:05 +0000
 Subject: [PATCH 6/8] TrebleSettings: Override minimum brightness

patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch

@@ -1,4 +1,4 @@
-From a6a87bfde5a552ac56f4e0a9c5fc4d20651bcb1a Mon Sep 17 00:00:00 2001
+From aaa4bae7bf8f22569f434f0b183d7dfc3c547ed6 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 17 Dec 2022 11:00:38 +0000
 Subject: [PATCH 7/8] TrebleSettings: Override navbar availability

patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch

@@ -1,4 +1,4 @@
-From 4d81eae95fe9b0265faee7fffafdc9487c856569 Mon Sep 17 00:00:00 2001
+From 382deaccfef1178077cd9c697e42d5bdcbe8c743 Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Sat, 17 Dec 2022 14:30:52 +0000
 Subject: [PATCH 8/8] TrebleSettings: Securize on-demand

patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch

@@ -1,4 +1,4 @@
-From 6d9740fc670b43077791f3880be05bb81cb1c38e Mon Sep 17 00:00:00 2001
+From 0385e978400c808b45db2488996ac7c2b21cd02a Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Wed, 24 Aug 2022 15:45:18 -0400
 Subject: [PATCH] audio_hal_interface: Optionally use sysbta HAL
@@ -13,31 +13,31 @@ Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860
  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 efdc469de4..3dd65b5394 100644
+index 9af28031f7..5a9dbbccad 100644
 --- a/system/audio_hal_interface/aidl/client_interface_aidl.cc
 +++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
 @@ -56,7 +56,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface(
  
  bool BluetoothAudioClientInterface::is_aidl_available() {
-   auto service = AServiceManager_checkService(
+   return AServiceManager_isDeclared(
 -      kDefaultAudioProviderFactoryInterface.c_str());
 +      audioProviderFactoryInterface().c_str());
-   return (service != nullptr);
  }
  
-@@ -73,7 +73,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) {
+ std::vector<AudioCapabilities>
+@@ -72,7 +72,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) {
    }
    auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
-       ::ndk::SpAIBinder(AServiceManager_getService(
+       ::ndk::SpAIBinder(AServiceManager_waitForService(
 -          kDefaultAudioProviderFactoryInterface.c_str())));
 +          audioProviderFactoryInterface().c_str())));
  
    if (provider_factory == nullptr) {
      LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
-@@ -101,7 +101,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() {
+@@ -99,7 +99,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() {
    }
    auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
-       ::ndk::SpAIBinder(AServiceManager_getService(
+       ::ndk::SpAIBinder(AServiceManager_waitForService(
 -          kDefaultAudioProviderFactoryInterface.c_str())));
 +          audioProviderFactoryInterface().c_str())));
  
@@ -103,5 +103,5 @@ index a2c192f37d..c3d1cf35c2 100644
      return;
    }
 -- 
-2.25.1
+2.34.1