From ca9375e755dff59d27d36fcde44d592aea6d0961 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 17 Apr 2022 11:14:26 +0000
Subject: [PATCH] Fix status bar height for Android 12L

Prior to 12L:
- values: sbh links to sbh_port
- values-land: sbh links to sbh_land
However, in 12L this was flipped around:
- values: sbh_port links to sbh
- values-land: defines sbh standalone
To fix for 12L without breaking them for prior versions, break the link and define each of them

Also, while we're at it, remove a few links in my own overlays, as they might break similarly in the future

Change-Id: Ib4d1896599f47a39274c4930fd765891bf143f7d
---
 Asus/ZenFone5/res/values-land/notch.xml       |   5 +
 Asus/ZenFone5/res/values/notch.xml            |   2 +
 Asus/ZenFone5Z/res/values-land/notch.xml      |   4 +
 Asus/ZenFone5Z/res/values/notch.xml           |   2 +
 Asus/ZenFoneMaxM2/res/values-land/notch.xml   |   4 +
 Asus/ZenFoneMaxM2/res/values/notch.xml        |   2 +
 Asus/ZenFoneMaxShot/res/values-land/notch.xml |   4 +
 Asus/ZenFoneMaxShot/res/values/notch.xml      |   2 +
 Asus/Zenfone5-10/res/values-land/config.xml   |   4 +
 Asus/Zenfone5-10/res/values/config.xml        |   3 +-
 Essential/PH-1/res/values-land/notch.xml      |   4 +
 Essential/PH-1/res/values/notch.xml           |   7 +-
 Huawei/ARE/res/values-land/config.xml         |   4 +
 Huawei/ARE/res/values/config.xml              |  11 +-
 Huawei/hi6250/ANE/res/values-land/notch.xml   |   4 +
 Huawei/hi6250/ANE/res/values/notch.xml        |   2 +
 Huawei/kirin970/CLT/res/values-land/notch.xml |   4 +
 Huawei/kirin970/CLT/res/values/notch.xml      |   2 +
 .../kirin970/COL/res/values-land/config.xml   |   4 +
 Huawei/kirin970/COL/res/values/config.xml     |   1 +
 .../kirin970/COR/res/values-land/config.xml   |   4 +
 Huawei/kirin970/COR/res/values/values.xml     |   2 +
 Huawei/kirin970/EML/res/values-land/notch.xml |   4 +
 Huawei/kirin970/EML/res/values/notch.xml      |   2 +
 Infinix/Note10Pro/res/values-land/config.xml  |   4 +
 Infinix/Note10Pro/res/values/config.xml       |   3 +-
 Infinix/Note7/res/values-land/notch.xml       |   4 +
 Infinix/Note7/res/values/notch.xml            |   2 +
 Infinix/Note8/res/values-land/notch.xml       |   4 +
 Infinix/Note8/res/values/notch.xml            |   2 +
 Infinix/S4/res/values-land/config.xml         |   4 +
 Infinix/S4/res/values/notch.xml               |   2 +
 Infinix/Zero6/res/values-land/notch.xml       |   4 +
 Infinix/Zero6/res/values/notch.xml            |   2 +
 LG/G7/res/values-land/notch.xml               |   4 +
 LG/G7/res/values/notch.xml                    |   2 +
 LG/V40/res/values-land/notch.xml              |   4 +
 LG/V40/res/values/notch.xml                   |   2 +
 LG/mfh505glm-SystemUI/res/values/config.xml   |   4 +-
 LG/mfh505glm/res/values-land/config.xml       |   3 +-
 LG/mfh505glm/res/values/config.xml            |   3 +-
 Lenovo/Z5/res/values-land/notch.xml           |   4 +
 Lenovo/Z5/res/values/notch.xml                |   2 +
 .../M2181-SystemUI/res/values-land/config.xml |   4 +
 Meizu/M2181-SystemUI/res/values/config.xml    |   6 +-
 Meizu/M2181/res/values-land/config.xml        |   3 +-
 Meizu/M2181/res/values/config.xml             |   3 +-
 Moto/E6Plus/res/values/config.xml             |   1 +
 Moto/G100-Nio/res/values-land/config.xml      |   4 +
 Moto/G100-Nio/res/values/config.xml           |   2 +
 Moto/G7Play/res/values/config.xml             |   1 +
 Moto/G8/res/values-land/config.xml            |   4 +
 Moto/G8/res/values/config.xml                 |   1 +
 Moto/G8Plus/res/values-land/config.xml        |   4 +
 Moto/G8Plus/res/values/config.xml             |   3 +-
 Moto/G8Power/res/values-land/config.xml       |   4 +
 Moto/G8Power/res/values/config.xml            |   3 +-
 Moto/One/res/values-land/notch.xml            |   2 +
 Moto/One/res/values/notch.xml                 |   2 +
 Moto/OneAction/res/values-land/notch.xml      |   2 +
 Moto/OneAction/res/values/notch.xml           |   2 +
 Moto/OneHyper/res/values-land/config.xml      |   4 +
 Moto/OneHyper/res/values/config.xml           |   3 +-
 Moto/hiphi-SystemUI/res/values/config.xml     |   4 +-
 Moto/hiphi/res/values-land/config.xml         |   3 +-
 Moto/hiphi/res/values/config.xml              |   3 +-
 Nokia/CTL-7.1/res/values-land/config.xml      |   4 +
 Nokia/CTL-7.1/res/values/config.xml           |   1 +
 .../DRG-6.1Plus-X6/res/values-land/config.xml |   4 +
 Nokia/DRG-6.1Plus-X6/res/values/config.xml    |   1 +
 Nokia/Nokia-4.2/res/values-land/config.xml    |   4 +
 Nokia/Nokia-4.2/res/values/notch.xml          |   7 +-
 .../res/values-land/notch.xml                 |   4 +
 .../res/values/notch.xml                      |   2 +
 Nokia/PNX-8.1-X7/res/values-land/config.xml   |   4 +
 Nokia/PNX-8.1-X7/res/values/config.xml        |   3 +-
 OPPO/A54-SystemUI/res/values/config.xml       |   4 +-
 OPPO/A54/res/values-land/config.xml           |   3 +-
 OPPO/A54/res/values/config.xml                |   3 +-
 OPPO/PEQM00-SystemUI/res/values/config.xml    |   6 +-
 OPPO/PEQM00/res/values-land/config.xml        |   3 +-
 OPPO/PEQM00/res/values/config.xml             |   3 +-
 .../res/values/config.xml                     |   4 +-
 OPPO/RenoPro2019/res/values-land/config.xml   |   3 +-
 OPPO/RenoPro2019/res/values/config.xml        |   3 +-
 OnePlus/N2-SystemUI/res/values/config.xml     |   4 +-
 OnePlus/N2/res/values-land/config.xml         |   3 +-
 OnePlus/N2/res/values/config.xml              |   3 +-
 OnePlus/N200-SystemUI/res/values/config.xml   |   4 +-
 OnePlus/N200/res/values-land/config.xml       |   3 +-
 OnePlus/N200/res/values/config.xml            |   3 +-
 .../OP10Pro-SystemUI/res/values/config.xml    |   4 +-
 OnePlus/OP10Pro/res/values-land/config.xml    |   3 +-
 OnePlus/OP10Pro/res/values/config.xml         |   3 +-
 OnePlus/OP6/res/values-land/notch.xml         |   4 +
 OnePlus/OP6/res/values/notch.xml              |   2 +
 OnePlus/OP6T/res/values-land/config.xml       |   4 +
 OnePlus/OP6T/res/values/config.xml            |   3 +-
 OnePlus/OP8-SystemUI/res/values/config.xml    |   4 +-
 OnePlus/OP8/res/values-land/config.xml        |   3 +-
 OnePlus/OP8/res/values/config.xml             |   3 +-
 Realme/6/res/values-land/config.xml           |   4 +
 Realme/6/res/values/notch.xml                 |   7 +-
 Realme/6i/res/values-land/notch.xml           |   4 +
 Realme/6i/res/values/notch.xml                |   7 +-
 Realme/C2/res/values/dimens.xml               |   1 +
 Realme/Q3/res/values-land/config.xml          |   3 +-
 Realme/Q3/res/values/config.xml               |   5 +-
 Realme/RMX2117-SystemUI/res/values/config.xml |   4 +-
 Realme/RMX2117/res/values-land/config.xml     |   3 +-
 Realme/RMX2117/res/values/config.xml          |   3 +-
 Realme/RMX3366-SystemUI/res/values/config.xml |   4 +-
 Realme/RMX3366/res/values-land/config.xml     |   3 +-
 Realme/RMX3366/res/values/config.xml          |   3 +-
 Samsung/A20/res/values/dimens.xml             |   1 +
 Samsung/A20s-SystemUI/res/values/config.xml   |   6 +-
 Samsung/A20s/res/values-land/dimens.xml       |   4 +
 Samsung/A20s/res/values/dimens.xml            |   5 +-
 Samsung/A30/res/values-land/dimens.xml        |   4 +
 Samsung/A30/res/values/dimens.xml             |   3 +-
 Samsung/A40/res/values-land/notch.xml         |   4 +
 Samsung/A40/res/values/notch.xml              |   3 +-
 Samsung/A50/res/values-land/dimens.xml        |   4 +
 Samsung/A50/res/values/dimens.xml             |   1 +
 Samsung/A7/res/values-land/dimens.xml         |   4 +
 Samsung/A7/res/values/dimens.xml              |   3 +-
 Samsung/A70/res/values-land/dimens.xml        |   4 +
 Samsung/A70/res/values/dimens.xml             |   2 +
 Samsung/A80/res/values-land/config.xml        |   4 +
 Samsung/A80/res/values/dimens.xml             |   2 +
 Samsung/S20fe/res/values-land/config.xml      |   4 +
 .../res/values/{configs.xml => config.xml}    |  10 +-
 Samsung/a51x/res/values-land/config.xml       |   4 +
 Samsung/a51x/res/values/config.xml            |   1 +
 Samsung/a60q/res/values-land/config.xml       |   4 +
 Samsung/a60q/res/values/config.xml            |   1 +
 .../d1q-SystemUI/res/values-land/config.xml   |   4 +
 Samsung/d1q-SystemUI/res/values/config.xml    |   6 +-
 Samsung/d1q/res/values-land/config.xml        |   3 +-
 Samsung/d1q/res/values/config.xml             |   3 +-
 .../d1x-SystemUI/res/values-land/config.xml   |   4 +
 Samsung/d1x-SystemUI/res/values/config.xml    |   6 +-
 Samsung/d1x/res/values-land/config.xml        |   3 +-
 Samsung/d1x/res/values/config.xml             |   3 +-
 .../res/values/config.xml                     |   4 +-
 .../starqltekdi/res/values-land/config.xml    |   3 +-
 Samsung/starqltekdi/res/values/config.xml     |   3 +-
 Sharp/S2/res/values-land/notch.xml            |   4 +
 Sharp/S2/res/values/notch.xml                 |   2 +
 Tecno/Camon11/res/values-land/notch.xml       |   4 +
 Tecno/Camon11/res/values/notch.xml            |   2 +
 Tecno/Spark5/res/values-land/dimens.xml       |   4 +
 Tecno/Spark5/res/values/dimens.xml            |   5 +-
 Teracube/2e/res/values/config.xml             |   1 +
 Teracube/v7101o/res/values-land/dimens.xml    |   4 +
 Teracube/v7101o/res/values/dimens.xml         |   1 +
 Umidigi/Power/res/values-land/notch.xml       |   4 +
 Umidigi/Power/res/values/notch.xml            |   4 +-
 Vivo/Y20/res/values-land/configs.xml          |   4 +-
 Vivo/Y20/res/values/configs.xml               |   9 +-
 Vsmart/Joy3/res/values-land/config.xml        |   4 +
 Vsmart/Joy3/res/values/config.xml             |   1 +
 Vsmart/Live/res/values-land/config.xml        |   4 +
 Vsmart/Live/res/values/config.xml             |   3 +-
 Xiaomi/Civi-SystemUI/res/values/config.xml    |   4 +-
 Xiaomi/Civi/res/values-land/config.xml        |   3 +-
 Xiaomi/Civi/res/values/config.xml             |   3 +-
 Xiaomi/Mi8/res/values-land/notch.xml          |   4 +
 Xiaomi/Mi8/res/values/notch.xml               |   2 +
 Xiaomi/Mi8EE/res/values-land/notch.xml        |   4 +
 Xiaomi/Mi8EE/res/values/notch.xml             |   2 +
 Xiaomi/Mi8Lite/res/values-land/notch.xml      |   4 +
 Xiaomi/Mi8Lite/res/values/notch.xml           |   4 +-
 Xiaomi/Mi8Pro/res/values-land/notch.xml       |   4 +
 Xiaomi/Mi8Pro/res/values/notch.xml            |   2 +
 Xiaomi/Mi8SE/res/values-land/notch.xml        |   4 +
 Xiaomi/Mi8SE/res/values/notch.xml             |   2 +
 Xiaomi/Mi9/res/values-land/notch.xml          |   4 +
 Xiaomi/Mi9/res/values/notch.xml               |   4 +-
 Xiaomi/Mi9SE/res/values-land/notch.xml        |   4 +
 Xiaomi/Mi9SE/res/values/notch.xml             |   4 +-
 Xiaomi/MiA2Lite/res/values-land/notch.xml     |   4 +
 Xiaomi/MiA2Lite/res/values/notch.xml          |   2 +
 Xiaomi/MiPlay/res/values-land/notch.xml       |   4 +
 Xiaomi/MiPlay/res/values/notch.xml            |   4 +-
 Xiaomi/PocoF1/res/values-land/notch.xml       |   4 +
 Xiaomi/PocoF1/res/values/notch.xml            |   2 +
 Xiaomi/Redmi10X5G/res/values/config.xml       |   7 +-
 Xiaomi/Redmi6Pro/res/values-land/notch.xml    |   4 +
 Xiaomi/Redmi6Pro/res/values/notch.xml         |   2 +
 Xiaomi/Redmi7onc/res/values/config.xml        |   1 +
 Xiaomi/Redmi8/res/values-land/config.xml      |   4 +
 Xiaomi/Redmi8/res/values/config.xml           | 341 +++++++++---------
 Xiaomi/Redmi8A/res/values/config.xml          |   1 +
 Xiaomi/Redmi9A/res/values/config.xml          |   1 +
 .../res/values/config.xml                     |   4 +-
 Xiaomi/RedmiK20Pro/res/values-land/config.xml |   3 +-
 Xiaomi/RedmiK20Pro/res/values/config.xml      |   3 +-
 Xiaomi/RedmiNote10Pro/res/values/config.xml   |   1 +
 Xiaomi/RedmiNote10S/res/values/config.xml     |   1 +
 .../RedmiNote6Pro/res/values-land/notch.xml   |   4 +
 Xiaomi/RedmiNote6Pro/res/values/notch.xml     |   2 +
 Xiaomi/RedmiNote7/res/values-land/notch.xml   |   4 +
 Xiaomi/RedmiNote7/res/values/notch.xml        |   4 +-
 Xiaomi/RedmiNote8Pro/res/values/notch.xml     |   5 +-
 .../RedmiNote9Pro/res/values-land/notch.xml   |   4 +
 Xiaomi/RedmiNote9Pro/res/values/notch.xml     |   1 +
 .../res/values-land/notch.xml                 |   4 +
 Xiaomi/RedmiNote9ProMax/res/values/notch.xml  |   1 +
 Xiaomi/RedmiNote9S/res/values-land/notch.xml  |   4 +
 Xiaomi/RedmiNote9S/res/values/notch.xml       |   1 +
 Xiaomi/RedmiNote9T/res/values/config.xml      |   1 +
 tests/blacklist                               |   1 -
 213 files changed, 745 insertions(+), 306 deletions(-)
 create mode 100644 Asus/ZenFone5/res/values-land/notch.xml
 create mode 100644 Asus/ZenFone5Z/res/values-land/notch.xml
 create mode 100644 Asus/ZenFoneMaxM2/res/values-land/notch.xml
 create mode 100644 Asus/ZenFoneMaxShot/res/values-land/notch.xml
 create mode 100644 Asus/Zenfone5-10/res/values-land/config.xml
 create mode 100644 Essential/PH-1/res/values-land/notch.xml
 create mode 100644 Huawei/ARE/res/values-land/config.xml
 create mode 100644 Huawei/hi6250/ANE/res/values-land/notch.xml
 create mode 100644 Huawei/kirin970/CLT/res/values-land/notch.xml
 create mode 100644 Huawei/kirin970/COL/res/values-land/config.xml
 create mode 100644 Huawei/kirin970/COR/res/values-land/config.xml
 create mode 100644 Huawei/kirin970/EML/res/values-land/notch.xml
 create mode 100644 Infinix/Note10Pro/res/values-land/config.xml
 create mode 100644 Infinix/Note7/res/values-land/notch.xml
 create mode 100644 Infinix/Note8/res/values-land/notch.xml
 create mode 100644 Infinix/S4/res/values-land/config.xml
 create mode 100644 Infinix/Zero6/res/values-land/notch.xml
 create mode 100644 LG/G7/res/values-land/notch.xml
 create mode 100644 LG/V40/res/values-land/notch.xml
 create mode 100644 Lenovo/Z5/res/values-land/notch.xml
 create mode 100644 Meizu/M2181-SystemUI/res/values-land/config.xml
 create mode 100644 Moto/G100-Nio/res/values-land/config.xml
 create mode 100644 Moto/G8/res/values-land/config.xml
 create mode 100644 Moto/G8Plus/res/values-land/config.xml
 create mode 100644 Moto/G8Power/res/values-land/config.xml
 create mode 100644 Moto/OneHyper/res/values-land/config.xml
 create mode 100644 Nokia/CTL-7.1/res/values-land/config.xml
 create mode 100644 Nokia/DRG-6.1Plus-X6/res/values-land/config.xml
 create mode 100644 Nokia/Nokia-4.2/res/values-land/config.xml
 create mode 100644 Nokia/PDA_sprout-5.1Plus-X5/res/values-land/notch.xml
 create mode 100644 Nokia/PNX-8.1-X7/res/values-land/config.xml
 create mode 100644 OnePlus/OP6/res/values-land/notch.xml
 create mode 100644 OnePlus/OP6T/res/values-land/config.xml
 create mode 100644 Realme/6/res/values-land/config.xml
 create mode 100644 Realme/6i/res/values-land/notch.xml
 create mode 100644 Samsung/A20s/res/values-land/dimens.xml
 create mode 100644 Samsung/A30/res/values-land/dimens.xml
 create mode 100644 Samsung/A40/res/values-land/notch.xml
 create mode 100644 Samsung/A50/res/values-land/dimens.xml
 create mode 100644 Samsung/A7/res/values-land/dimens.xml
 create mode 100644 Samsung/A70/res/values-land/dimens.xml
 create mode 100644 Samsung/A80/res/values-land/config.xml
 create mode 100644 Samsung/S20fe/res/values-land/config.xml
 rename Samsung/S20fe/res/values/{configs.xml => config.xml} (99%)
 create mode 100644 Samsung/a51x/res/values-land/config.xml
 create mode 100644 Samsung/a60q/res/values-land/config.xml
 create mode 100644 Samsung/d1q-SystemUI/res/values-land/config.xml
 create mode 100644 Samsung/d1x-SystemUI/res/values-land/config.xml
 create mode 100644 Sharp/S2/res/values-land/notch.xml
 create mode 100644 Tecno/Camon11/res/values-land/notch.xml
 create mode 100644 Tecno/Spark5/res/values-land/dimens.xml
 create mode 100644 Teracube/v7101o/res/values-land/dimens.xml
 create mode 100644 Umidigi/Power/res/values-land/notch.xml
 create mode 100644 Vsmart/Joy3/res/values-land/config.xml
 create mode 100644 Vsmart/Live/res/values-land/config.xml
 create mode 100644 Xiaomi/Mi8/res/values-land/notch.xml
 create mode 100644 Xiaomi/Mi8EE/res/values-land/notch.xml
 create mode 100644 Xiaomi/Mi8Lite/res/values-land/notch.xml
 create mode 100644 Xiaomi/Mi8Pro/res/values-land/notch.xml
 create mode 100644 Xiaomi/Mi8SE/res/values-land/notch.xml
 create mode 100644 Xiaomi/Mi9/res/values-land/notch.xml
 create mode 100644 Xiaomi/Mi9SE/res/values-land/notch.xml
 create mode 100644 Xiaomi/MiA2Lite/res/values-land/notch.xml
 create mode 100644 Xiaomi/MiPlay/res/values-land/notch.xml
 create mode 100644 Xiaomi/PocoF1/res/values-land/notch.xml
 create mode 100644 Xiaomi/Redmi6Pro/res/values-land/notch.xml
 create mode 100644 Xiaomi/Redmi8/res/values-land/config.xml
 create mode 100644 Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
 create mode 100644 Xiaomi/RedmiNote7/res/values-land/notch.xml
 create mode 100644 Xiaomi/RedmiNote9Pro/res/values-land/notch.xml
 create mode 100644 Xiaomi/RedmiNote9ProMax/res/values-land/notch.xml
 create mode 100644 Xiaomi/RedmiNote9S/res/values-land/notch.xml

diff --git a/Asus/ZenFone5/res/values-land/notch.xml b/Asus/ZenFone5/res/values-land/notch.xml
new file mode 100644
index 0000000..f62d76b
--- /dev/null
+++ b/Asus/ZenFone5/res/values-land/notch.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Asus/ZenFone5/res/values/notch.xml b/Asus/ZenFone5/res/values/notch.xml
index a0550ef..a928dc1 100644
--- a/Asus/ZenFone5/res/values/notch.xml
+++ b/Asus/ZenFone5/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Asus/ZenFone5Z/res/values-land/notch.xml b/Asus/ZenFone5Z/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Asus/ZenFone5Z/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Asus/ZenFone5Z/res/values/notch.xml b/Asus/ZenFone5Z/res/values/notch.xml
index a0550ef..a928dc1 100644
--- a/Asus/ZenFone5Z/res/values/notch.xml
+++ b/Asus/ZenFone5Z/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Asus/ZenFoneMaxM2/res/values-land/notch.xml b/Asus/ZenFoneMaxM2/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Asus/ZenFoneMaxM2/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Asus/ZenFoneMaxM2/res/values/notch.xml b/Asus/ZenFoneMaxM2/res/values/notch.xml
index c3bedc6..b3eeaf9 100644
--- a/Asus/ZenFoneMaxM2/res/values/notch.xml
+++ b/Asus/ZenFoneMaxM2/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">57px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">57px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Asus/ZenFoneMaxShot/res/values-land/notch.xml b/Asus/ZenFoneMaxShot/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Asus/ZenFoneMaxShot/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Asus/ZenFoneMaxShot/res/values/notch.xml b/Asus/ZenFoneMaxShot/res/values/notch.xml
index c5d9646..0db68a2 100644
--- a/Asus/ZenFoneMaxShot/res/values/notch.xml
+++ b/Asus/ZenFoneMaxShot/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Asus/Zenfone5-10/res/values-land/config.xml b/Asus/Zenfone5-10/res/values-land/config.xml
new file mode 100644
index 0000000..d89c7e6
--- /dev/null
+++ b/Asus/Zenfone5-10/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28dp</dimen>
+</resources>
diff --git a/Asus/Zenfone5-10/res/values/config.xml b/Asus/Zenfone5-10/res/values/config.xml
index 712ce6e..4e615a1 100644
--- a/Asus/Zenfone5-10/res/values/config.xml
+++ b/Asus/Zenfone5-10/res/values/config.xml
@@ -4,7 +4,8 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
-    <dimen name="status_bar_height_portrait">87.0px</dimen>
+    <dimen name="status_bar_height">87px</dimen>
+    <dimen name="status_bar_height_portrait">87px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>
diff --git a/Essential/PH-1/res/values-land/notch.xml b/Essential/PH-1/res/values-land/notch.xml
new file mode 100644
index 0000000..fb89265
--- /dev/null
+++ b/Essential/PH-1/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">84px</dimen>
+</resources>
diff --git a/Essential/PH-1/res/values/notch.xml b/Essential/PH-1/res/values/notch.xml
index a3673f1..f5f4adb 100644
--- a/Essential/PH-1/res/values/notch.xml
+++ b/Essential/PH-1/res/values/notch.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<dimen name="status_bar_height_portrait">144.0px</dimen>
-<dimen name="status_bar_height_landscape">84px</dimen>
-<string name="config_mainBuiltInDisplayCutout">M -70, 0 L -70, 137 L 70, 137 L 70, 0 Z</string>
+    <dimen name="status_bar_height">144.0px</dimen>
+    <dimen name="status_bar_height_portrait">144.0px</dimen>
+    <dimen name="status_bar_height_landscape">84px</dimen>
+    <string name="config_mainBuiltInDisplayCutout">M -70, 0 L -70, 137 L 70, 137 L 70, 0 Z</string>
 </resources>
diff --git a/Huawei/ARE/res/values-land/config.xml b/Huawei/ARE/res/values-land/config.xml
new file mode 100644
index 0000000..b63c1c5
--- /dev/null
+++ b/Huawei/ARE/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">96px</dimen>
+</resources>
diff --git a/Huawei/ARE/res/values/config.xml b/Huawei/ARE/res/values/config.xml
index 0c83a91..fa77f4f 100644
--- a/Huawei/ARE/res/values/config.xml
+++ b/Huawei/ARE/res/values/config.xml
@@ -3,13 +3,14 @@
     <bool name="config_automatic_brightness_available">true</bool>
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
-    
+
+    <dimen name="status_bar_height">96px</dimen>
     <dimen name="status_bar_height_portrait">96px</dimen>
     <dimen name="status_bar_height_landscape">96px</dimen>
-    
+
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>
     <fraction name="config_maximumScreenDimRatio">20.000004%</fraction>
-    
+
     <integer name="config_screenBrightnessDark">1</integer>
     <integer name="config_screenBrightnessDim">6</integer>
     <integer name="config_screenBrightnessDoze">1</integer>
@@ -19,7 +20,7 @@
     <integer name="config_autoBrightnessDarkeningLightDebounce">8000</integer>
     <integer name="config_brightness_ramp_rate_fast">180</integer>
     <integer name="config_brightness_ramp_rate_slow">60</integer>
-    
+
     <integer-array name="config_autoBrightnessLevels">
         <item>8</item>
         <item>55</item>
@@ -35,6 +36,6 @@
         <item>250</item>
         <item>255</item>
     </integer-array>
-    
+
     <string name="config_mainBuiltInDisplayCutout">M-100,0c17.9,0 32.8,19.4 32.8,32.8l0,0C-62.4,68.6 -38.7,96 0,96c37.1,0 62.4,-27.4 67.3,-63.2l0,0C67.3,19.4 82.1,0 100,0H-100z</string>
 </resources>
diff --git a/Huawei/hi6250/ANE/res/values-land/notch.xml b/Huawei/hi6250/ANE/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Huawei/hi6250/ANE/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Huawei/hi6250/ANE/res/values/notch.xml b/Huawei/hi6250/ANE/res/values/notch.xml
index 8c391b5..82a0cc4 100644
--- a/Huawei/hi6250/ANE/res/values/notch.xml
+++ b/Huawei/hi6250/ANE/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">90px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">90px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Huawei/kirin970/CLT/res/values-land/notch.xml b/Huawei/kirin970/CLT/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Huawei/kirin970/CLT/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Huawei/kirin970/CLT/res/values/notch.xml b/Huawei/kirin970/CLT/res/values/notch.xml
index ba85b16..4417be2 100644
--- a/Huawei/kirin970/CLT/res/values/notch.xml
+++ b/Huawei/kirin970/CLT/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Huawei/kirin970/COL/res/values-land/config.xml b/Huawei/kirin970/COL/res/values-land/config.xml
new file mode 100644
index 0000000..d3fc2ba
--- /dev/null
+++ b/Huawei/kirin970/COL/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">90px</dimen>
+</resources>
diff --git a/Huawei/kirin970/COL/res/values/config.xml b/Huawei/kirin970/COL/res/values/config.xml
index 61b0f94..13845a1 100644
--- a/Huawei/kirin970/COL/res/values/config.xml
+++ b/Huawei/kirin970/COL/res/values/config.xml
@@ -39,6 +39,7 @@
     <dimen name="navigation_bar_width">7.5mm</dimen>
     <dimen name="notification_header_padding_bottom">8.0dip</dimen>
     <dimen name="notification_header_padding_top">8.0dip</dimen>
+    <dimen name="status_bar_height">90px</dimen>
     <dimen name="status_bar_height_portrait">90px</dimen>
     <dimen name="status_bar_height_landscape">90px</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -156,0 L -156,90 L 156,90 L 156,0 Z</string>
diff --git a/Huawei/kirin970/COR/res/values-land/config.xml b/Huawei/kirin970/COR/res/values-land/config.xml
new file mode 100644
index 0000000..819d72a
--- /dev/null
+++ b/Huawei/kirin970/COR/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">88px</dimen>
+</resources>
diff --git a/Huawei/kirin970/COR/res/values/values.xml b/Huawei/kirin970/COR/res/values/values.xml
index dc403c5..3583db3 100644
--- a/Huawei/kirin970/COR/res/values/values.xml
+++ b/Huawei/kirin970/COR/res/values/values.xml
@@ -67,6 +67,8 @@
     <dimen name="navigation_bar_width">88px</dimen>
     <dimen name="notification_header_padding_top">8.0dip</dimen>
     <dimen name="notification_header_padding_bottom">8.0dip</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Huawei/kirin970/EML/res/values-land/notch.xml b/Huawei/kirin970/EML/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Huawei/kirin970/EML/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Huawei/kirin970/EML/res/values/notch.xml b/Huawei/kirin970/EML/res/values/notch.xml
index 3a24285..8595f9b 100644
--- a/Huawei/kirin970/EML/res/values/notch.xml
+++ b/Huawei/kirin970/EML/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">85px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">85px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Infinix/Note10Pro/res/values-land/config.xml b/Infinix/Note10Pro/res/values-land/config.xml
new file mode 100644
index 0000000..606eb19
--- /dev/null
+++ b/Infinix/Note10Pro/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>
diff --git a/Infinix/Note10Pro/res/values/config.xml b/Infinix/Note10Pro/res/values/config.xml
index e7f6cc7..9bb0e09 100755
--- a/Infinix/Note10Pro/res/values/config.xml
+++ b/Infinix/Note10Pro/res/values/config.xml
@@ -15,8 +15,9 @@
     <bool name="skip_restoring_network_selection">true</bool>
 
     <dimen name="quick_qs_offset_height">36.0dip</dimen>
-    <dimen name="status_bar_height_landscape">28.0dip</dimen>
+    <dimen name="status_bar_height">36.0dip</dimen>
     <dimen name="status_bar_height_portrait">36.0dip</dimen>
+    <dimen name="status_bar_height_landscape">28.0dip</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">10</integer>
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
diff --git a/Infinix/Note7/res/values-land/notch.xml b/Infinix/Note7/res/values-land/notch.xml
new file mode 100644
index 0000000..606eb19
--- /dev/null
+++ b/Infinix/Note7/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>
diff --git a/Infinix/Note7/res/values/notch.xml b/Infinix/Note7/res/values/notch.xml
index c92ca3e..ba653c6 100644
--- a/Infinix/Note7/res/values/notch.xml
+++ b/Infinix/Note7/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">40.0dip</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">40.0dip</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Infinix/Note8/res/values-land/notch.xml b/Infinix/Note8/res/values-land/notch.xml
new file mode 100644
index 0000000..606eb19
--- /dev/null
+++ b/Infinix/Note8/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>
diff --git a/Infinix/Note8/res/values/notch.xml b/Infinix/Note8/res/values/notch.xml
index c5d1d4f..489472a 100644
--- a/Infinix/Note8/res/values/notch.xml
+++ b/Infinix/Note8/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">44.0dip</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">44.0dip</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Infinix/S4/res/values-land/config.xml b/Infinix/S4/res/values-land/config.xml
new file mode 100644
index 0000000..606eb19
--- /dev/null
+++ b/Infinix/S4/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>
diff --git a/Infinix/S4/res/values/notch.xml b/Infinix/S4/res/values/notch.xml
index 5834cea..1dc7d09 100644
--- a/Infinix/S4/res/values/notch.xml
+++ b/Infinix/S4/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">50px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">50px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Infinix/Zero6/res/values-land/notch.xml b/Infinix/Zero6/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Infinix/Zero6/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Infinix/Zero6/res/values/notch.xml b/Infinix/Zero6/res/values/notch.xml
index dfc26de..5ea97ca 100644
--- a/Infinix/Zero6/res/values/notch.xml
+++ b/Infinix/Zero6/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">86.0px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">86.0px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/LG/G7/res/values-land/notch.xml b/LG/G7/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/LG/G7/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/LG/G7/res/values/notch.xml b/LG/G7/res/values/notch.xml
index ecac092..38fa002 100644
--- a/LG/G7/res/values/notch.xml
+++ b/LG/G7/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/LG/V40/res/values-land/notch.xml b/LG/V40/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/LG/V40/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/LG/V40/res/values/notch.xml b/LG/V40/res/values/notch.xml
index ecac092..38fa002 100644
--- a/LG/V40/res/values/notch.xml
+++ b/LG/V40/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/LG/mfh505glm-SystemUI/res/values/config.xml b/LG/mfh505glm-SystemUI/res/values/config.xml
index ee236bf..85c3fd5 100644
--- a/LG/mfh505glm-SystemUI/res/values/config.xml
+++ b/LG/mfh505glm-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">35px</dimen>
     <dimen name="status_bar_padding_end">35px</dimen>
     <dimen name="status_bar_header_height_keyguard">124px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">35px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">35px</dimen>
 </resources>
diff --git a/LG/mfh505glm/res/values-land/config.xml b/LG/mfh505glm/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/LG/mfh505glm/res/values-land/config.xml
+++ b/LG/mfh505glm/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/LG/mfh505glm/res/values/config.xml b/LG/mfh505glm/res/values/config.xml
index d13ee65..d71943a 100644
--- a/LG/mfh505glm/res/values/config.xml
+++ b/LG/mfh505glm/res/values/config.xml
@@ -3,9 +3,10 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">124px</dimen>
     <dimen name="status_bar_height_portrait">124px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">124px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/Lenovo/Z5/res/values-land/notch.xml b/Lenovo/Z5/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Lenovo/Z5/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Lenovo/Z5/res/values/notch.xml b/Lenovo/Z5/res/values/notch.xml
index a0550ef..a928dc1 100644
--- a/Lenovo/Z5/res/values/notch.xml
+++ b/Lenovo/Z5/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">87px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">87px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Meizu/M2181-SystemUI/res/values-land/config.xml b/Meizu/M2181-SystemUI/res/values-land/config.xml
new file mode 100644
index 0000000..0356339
--- /dev/null
+++ b/Meizu/M2181-SystemUI/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
+</resources>
diff --git a/Meizu/M2181-SystemUI/res/values/config.xml b/Meizu/M2181-SystemUI/res/values/config.xml
index 166a8e9..4d11da4 100644
--- a/Meizu/M2181-SystemUI/res/values/config.xml
+++ b/Meizu/M2181-SystemUI/res/values/config.xml
@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">50px</dimen>
     <dimen name="status_bar_padding_end">50px</dimen>
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="status_bar_header_height_keyguard">96px</dimen>
+    <dimen name="keyguard_carrier_text_margin">50px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">50px</dimen>
 </resources>
diff --git a/Meizu/M2181/res/values-land/config.xml b/Meizu/M2181/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Meizu/M2181/res/values-land/config.xml
+++ b/Meizu/M2181/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Meizu/M2181/res/values/config.xml b/Meizu/M2181/res/values/config.xml
index 7a27f38..e5b0620 100644
--- a/Meizu/M2181/res/values/config.xml
+++ b/Meizu/M2181/res/values/config.xml
@@ -7,9 +7,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">96px</dimen>
     <dimen name="status_bar_height_portrait">96px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">96px</dimen>
 
     <integer name="config_screenBrightnessDoze">5</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Moto/E6Plus/res/values/config.xml b/Moto/E6Plus/res/values/config.xml
index 0218aec..565e16d 100644
--- a/Moto/E6Plus/res/values/config.xml
+++ b/Moto/E6Plus/res/values/config.xml
@@ -19,6 +19,7 @@
         <item>mobile_ia,14,0,2,-1,true</item>
         <item>mobile_emergency,15,0,2,-1,true</item>
     </string-array>
+    <dimen name="status_bar_height">24.0dip</dimen>
     <dimen name="status_bar_height_portrait">24.0dip</dimen>
     <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">1500</integer>
diff --git a/Moto/G100-Nio/res/values-land/config.xml b/Moto/G100-Nio/res/values-land/config.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Moto/G100-Nio/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Moto/G100-Nio/res/values/config.xml b/Moto/G100-Nio/res/values/config.xml
index 4af1f9e..465b308 100644
--- a/Moto/G100-Nio/res/values/config.xml
+++ b/Moto/G100-Nio/res/values/config.xml
@@ -263,6 +263,8 @@
     <!-- Default radius of the software rounded corners. -->
     <dimen name="rounded_corner_radius">105px</dimen>
 
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">120px</dimen>
     <!-- Height of the status bar in portrait. The height should be
          Max((status bar content height + waterfall top size), top cutout size) -->
     <dimen name="status_bar_height_portrait">120px</dimen>
diff --git a/Moto/G7Play/res/values/config.xml b/Moto/G7Play/res/values/config.xml
index 02b63b3..1c5ca6d 100644
--- a/Moto/G7Play/res/values/config.xml
+++ b/Moto/G7Play/res/values/config.xml
@@ -7,6 +7,7 @@
     <bool name="config_wifi_dual_band_support">false</bool>
     <bool name="config_wifi_enable_disconnection_debounce">true</bool>
     <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
+    <dimen name="status_bar_height">72px</dimen>
     <dimen name="status_bar_height_portrait">72px</dimen>
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
     <integer name="config_autoPowerModeAnyMotionSensor">30</integer>
diff --git a/Moto/G8/res/values-land/config.xml b/Moto/G8/res/values-land/config.xml
new file mode 100644
index 0000000..d89c7e6
--- /dev/null
+++ b/Moto/G8/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28dp</dimen>
+</resources>
diff --git a/Moto/G8/res/values/config.xml b/Moto/G8/res/values/config.xml
index c3f7f9c..e518885 100644
--- a/Moto/G8/res/values/config.xml
+++ b/Moto/G8/res/values/config.xml
@@ -3,6 +3,7 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">71.0px</dimen>
     <dimen name="status_bar_height_portrait">71.0px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
diff --git a/Moto/G8Plus/res/values-land/config.xml b/Moto/G8Plus/res/values-land/config.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Moto/G8Plus/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Moto/G8Plus/res/values/config.xml b/Moto/G8Plus/res/values/config.xml
index 7be6249..4458135 100644
--- a/Moto/G8Plus/res/values/config.xml
+++ b/Moto/G8Plus/res/values/config.xml
@@ -27,8 +27,9 @@
     <bool name="config_wifi_dual_band_support">true</bool>
     <bool name="config_displayBlanksAfterDoze">false</bool>
     <bool name="skip_restoring_network_selection">true</bool>
-    <dimen name="status_bar_height_landscape">24dp</dimen>
+    <dimen name="status_bar_height">24dp</dimen>
     <dimen name="status_bar_height_portrait">24dp</dimen>
+    <dimen name="status_bar_height_landscape">24dp</dimen>
 
     <string name="config_mainBuiltInDisplayCutout">M -85,0 L -84,72.5 L 85,72.5 L 85,0 Z</string>
 
diff --git a/Moto/G8Power/res/values-land/config.xml b/Moto/G8Power/res/values-land/config.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Moto/G8Power/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Moto/G8Power/res/values/config.xml b/Moto/G8Power/res/values/config.xml
index c86a105..2b5bfbb 100644
--- a/Moto/G8Power/res/values/config.xml
+++ b/Moto/G8Power/res/values/config.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="status_bar_height_landscape">24dp</dimen>
+    <dimen name="status_bar_height">122px</dimen>
     <dimen name="status_bar_height_portrait">122px</dimen>
+    <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="quick_qs_offset_height">122px</dimen>
     <string name="config_mainBuiltInDisplayCutout">M -544,0 L -416,0 L -416,116 L -544,116 Z</string>
 </resources>
diff --git a/Moto/One/res/values-land/notch.xml b/Moto/One/res/values-land/notch.xml
index 3d158b3..8d3f98a 100644
--- a/Moto/One/res/values-land/notch.xml
+++ b/Moto/One/res/values-land/notch.xml
@@ -17,4 +17,6 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
 </resources>
diff --git a/Moto/One/res/values/notch.xml b/Moto/One/res/values/notch.xml
index ab0cab3..ba255d9 100644
--- a/Moto/One/res/values/notch.xml
+++ b/Moto/One/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">62px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">62px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Moto/OneAction/res/values-land/notch.xml b/Moto/OneAction/res/values-land/notch.xml
index 3d158b3..8d3f98a 100644
--- a/Moto/OneAction/res/values-land/notch.xml
+++ b/Moto/OneAction/res/values-land/notch.xml
@@ -17,4 +17,6 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
 </resources>
diff --git a/Moto/OneAction/res/values/notch.xml b/Moto/OneAction/res/values/notch.xml
index ab4efbf..8c4ca7f 100644
--- a/Moto/OneAction/res/values/notch.xml
+++ b/Moto/OneAction/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">165px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">165px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Moto/OneHyper/res/values-land/config.xml b/Moto/OneHyper/res/values-land/config.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Moto/OneHyper/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Moto/OneHyper/res/values/config.xml b/Moto/OneHyper/res/values/config.xml
index 7f1db23..71e1f86 100644
--- a/Moto/OneHyper/res/values/config.xml
+++ b/Moto/OneHyper/res/values/config.xml
@@ -26,8 +26,9 @@
     <bool name="config_wifi_dual_band_support">true</bool>
     <bool name="config_displayBlanksAfterDoze">false</bool>
     <bool name="skip_restoring_network_selection">true</bool>
-    <dimen name="status_bar_height_landscape">24dp</dimen>
+    <dimen name="status_bar_height">80px</dimen>
     <dimen name="status_bar_height_portrait">80px</dimen>
+    <dimen name="status_bar_height_landscape">24dp</dimen>
 
     <integer name="config_screenBrightnessSettingDefault">55</integer>
     <integer name="config_screenBrightnessSettingMinimum">2</integer>
diff --git a/Moto/hiphi-SystemUI/res/values/config.xml b/Moto/hiphi-SystemUI/res/values/config.xml
index 7627375..82313fb 100644
--- a/Moto/hiphi-SystemUI/res/values/config.xml
+++ b/Moto/hiphi-SystemUI/res/values/config.xml
@@ -3,8 +3,8 @@
     <dimen name="status_bar_padding_start">35px</dimen>
     <dimen name="status_bar_padding_end">35px</dimen>
     <dimen name="status_bar_header_height_keyguard">102px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">35px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">35px</dimen>
 
     <!-- Moto please no -->
     <dimen name="rounded_corner_content_padding">4dp</dimen>
diff --git a/Moto/hiphi/res/values-land/config.xml b/Moto/hiphi/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Moto/hiphi/res/values-land/config.xml
+++ b/Moto/hiphi/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Moto/hiphi/res/values/config.xml b/Moto/hiphi/res/values/config.xml
index 4cab3ed..25b40e3 100644
--- a/Moto/hiphi/res/values/config.xml
+++ b/Moto/hiphi/res/values/config.xml
@@ -8,9 +8,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">102px</dimen>
     <dimen name="status_bar_height_portrait">102px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">102px</dimen>
 
     <integer name="config_screenBrightnessDoze">6</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Nokia/CTL-7.1/res/values-land/config.xml b/Nokia/CTL-7.1/res/values-land/config.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Nokia/CTL-7.1/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Nokia/CTL-7.1/res/values/config.xml b/Nokia/CTL-7.1/res/values/config.xml
index eac70b2..beb36ac 100644
--- a/Nokia/CTL-7.1/res/values/config.xml
+++ b/Nokia/CTL-7.1/res/values/config.xml
@@ -3,6 +3,7 @@
     <bool name="config_supportDoubleTapWake">true</bool>
     <bool name="config_dozePulsePickup">true</bool>
 
+    <dimen name="status_bar_height">89px</dimen>
     <dimen name="status_bar_height_portrait">89px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="rounded_corner_radius_top">106px</dimen>
diff --git a/Nokia/DRG-6.1Plus-X6/res/values-land/config.xml b/Nokia/DRG-6.1Plus-X6/res/values-land/config.xml
new file mode 100644
index 0000000..b5d881e
--- /dev/null
+++ b/Nokia/DRG-6.1Plus-X6/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">89.0px</dimen>
+</resources>
diff --git a/Nokia/DRG-6.1Plus-X6/res/values/config.xml b/Nokia/DRG-6.1Plus-X6/res/values/config.xml
index f2d038a..a567648 100644
--- a/Nokia/DRG-6.1Plus-X6/res/values/config.xml
+++ b/Nokia/DRG-6.1Plus-X6/res/values/config.xml
@@ -3,6 +3,7 @@
     <bool name="config_supportDoubleTapWake">true</bool>
     <bool name="config_dozePulsePickup">true</bool>
 
+    <dimen name="status_bar_height">89.0px</dimen>
     <dimen name="status_bar_height_portrait">89.0px</dimen>
     <dimen name="status_bar_height_landscape">89.0px</dimen>
 
diff --git a/Nokia/Nokia-4.2/res/values-land/config.xml b/Nokia/Nokia-4.2/res/values-land/config.xml
new file mode 100644
index 0000000..3db0de0
--- /dev/null
+++ b/Nokia/Nokia-4.2/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">60px</dimen>
+</resources>
diff --git a/Nokia/Nokia-4.2/res/values/notch.xml b/Nokia/Nokia-4.2/res/values/notch.xml
index b8c49e1..6dda0c0 100644
--- a/Nokia/Nokia-4.2/res/values/notch.xml
+++ b/Nokia/Nokia-4.2/res/values/notch.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<dimen name="status_bar_height_portrait">60px</dimen>
-<dimen name="status_bar_height_landscape">60px</dimen>
-<string name="config_mainBuiltInDisplayCutout">M 0,0 L -24,0 C -24,0 -24,31 0,31 C 0,31 24,31 24,0 Z @dp</string>
+    <dimen name="status_bar_height">60px</dimen>
+    <dimen name="status_bar_height_portrait">60px</dimen>
+    <dimen name="status_bar_height_landscape">60px</dimen>
+    <string name="config_mainBuiltInDisplayCutout">M 0,0 L -24,0 C -24,0 -24,31 0,31 C 0,31 24,31 24,0 Z @dp</string>
 </resources>
diff --git a/Nokia/PDA_sprout-5.1Plus-X5/res/values-land/notch.xml b/Nokia/PDA_sprout-5.1Plus-X5/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Nokia/PDA_sprout-5.1Plus-X5/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Nokia/PDA_sprout-5.1Plus-X5/res/values/notch.xml b/Nokia/PDA_sprout-5.1Plus-X5/res/values/notch.xml
index ca5f434..8270762 100644
--- a/Nokia/PDA_sprout-5.1Plus-X5/res/values/notch.xml
+++ b/Nokia/PDA_sprout-5.1Plus-X5/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">62px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">62px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Nokia/PNX-8.1-X7/res/values-land/config.xml b/Nokia/PNX-8.1-X7/res/values-land/config.xml
new file mode 100644
index 0000000..5f2985d
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">86px</dimen>
+</resources>
diff --git a/Nokia/PNX-8.1-X7/res/values/config.xml b/Nokia/PNX-8.1-X7/res/values/config.xml
index 84a21b1..d96d889 100644
--- a/Nokia/PNX-8.1-X7/res/values/config.xml
+++ b/Nokia/PNX-8.1-X7/res/values/config.xml
@@ -7,6 +7,7 @@
     <bool name="config_automatic_brightness_available">true</bool>
     <bool name="config_wifi_dual_band_support">true</bool>
 
+    <dimen name="status_bar_height">86px</dimen>
     <dimen name="status_bar_height_portrait">86px</dimen>
     <dimen name="status_bar_height_landscape">86px</dimen>
     <dimen name="rounded_corner_radius_top">110.0px</dimen>
@@ -27,7 +28,7 @@
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">8000</integer>
-	
+
     <integer-array name="config_autoBrightnessDisplayValuesNits">
         <item>9</item>
         <item>13</item>
diff --git a/OPPO/A54-SystemUI/res/values/config.xml b/OPPO/A54-SystemUI/res/values/config.xml
index 340c0ef..ea7b09f 100644
--- a/OPPO/A54-SystemUI/res/values/config.xml
+++ b/OPPO/A54-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">16px</dimen>
     <dimen name="status_bar_padding_end">30px</dimen>
     <dimen name="status_bar_header_height_keyguard">88px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">16px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">30px</dimen>
 </resources>
diff --git a/OPPO/A54/res/values-land/config.xml b/OPPO/A54/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/OPPO/A54/res/values-land/config.xml
+++ b/OPPO/A54/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OPPO/A54/res/values/config.xml b/OPPO/A54/res/values/config.xml
index a4a3c39..1a24949 100644
--- a/OPPO/A54/res/values/config.xml
+++ b/OPPO/A54/res/values/config.xml
@@ -4,9 +4,10 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
 
+    <dimen name="status_bar_height">88px</dimen>
     <dimen name="status_bar_height_portrait">88px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">88px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/OPPO/PEQM00-SystemUI/res/values/config.xml b/OPPO/PEQM00-SystemUI/res/values/config.xml
index ea6d132..a7359b7 100644
--- a/OPPO/PEQM00-SystemUI/res/values/config.xml
+++ b/OPPO/PEQM00-SystemUI/res/values/config.xml
@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="status_bar_header_height_keyguard">139px</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/OPPO/PEQM00/res/values-land/config.xml b/OPPO/PEQM00/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/OPPO/PEQM00/res/values-land/config.xml
+++ b/OPPO/PEQM00/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OPPO/PEQM00/res/values/config.xml b/OPPO/PEQM00/res/values/config.xml
index 89123b2..eeb1c83 100644
--- a/OPPO/PEQM00/res/values/config.xml
+++ b/OPPO/PEQM00/res/values/config.xml
@@ -3,9 +3,10 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">139px</dimen>
     <dimen name="status_bar_height_portrait">139px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">139px</dimen>
 
     <integer-array name="config_autoBrightnessLevels">
         <item>128</item>
diff --git a/OPPO/RenoPro2019-SystemUI/res/values/config.xml b/OPPO/RenoPro2019-SystemUI/res/values/config.xml
index d858296..59e33ed 100644
--- a/OPPO/RenoPro2019-SystemUI/res/values/config.xml
+++ b/OPPO/RenoPro2019-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">132px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/OPPO/RenoPro2019/res/values-land/config.xml b/OPPO/RenoPro2019/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/OPPO/RenoPro2019/res/values-land/config.xml
+++ b/OPPO/RenoPro2019/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OPPO/RenoPro2019/res/values/config.xml b/OPPO/RenoPro2019/res/values/config.xml
index 3993970..bc9284a 100644
--- a/OPPO/RenoPro2019/res/values/config.xml
+++ b/OPPO/RenoPro2019/res/values/config.xml
@@ -4,9 +4,10 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
 
+    <dimen name="status_bar_height">132px</dimen>
     <dimen name="status_bar_height_portrait">132px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">132px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/OnePlus/N2-SystemUI/res/values/config.xml b/OnePlus/N2-SystemUI/res/values/config.xml
index a155c5f..a7359b7 100755
--- a/OnePlus/N2-SystemUI/res/values/config.xml
+++ b/OnePlus/N2-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">139px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/OnePlus/N2/res/values-land/config.xml b/OnePlus/N2/res/values-land/config.xml
index 9d6de4c..80d82e4 100755
--- a/OnePlus/N2/res/values-land/config.xml
+++ b/OnePlus/N2/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OnePlus/N2/res/values/config.xml b/OnePlus/N2/res/values/config.xml
index cd6cc30..b4e06fa 100755
--- a/OnePlus/N2/res/values/config.xml
+++ b/OnePlus/N2/res/values/config.xml
@@ -8,9 +8,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">139px</dimen>
     <dimen name="status_bar_height_portrait">139px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">139px</dimen>
 
     <integer name="config_screenBrightnessDoze">2</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/OnePlus/N200-SystemUI/res/values/config.xml b/OnePlus/N200-SystemUI/res/values/config.xml
index 051228b..5414023 100644
--- a/OnePlus/N200-SystemUI/res/values/config.xml
+++ b/OnePlus/N200-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">133px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/OnePlus/N200/res/values-land/config.xml b/OnePlus/N200/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/OnePlus/N200/res/values-land/config.xml
+++ b/OnePlus/N200/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OnePlus/N200/res/values/config.xml b/OnePlus/N200/res/values/config.xml
index ed79451..0f7ae79 100644
--- a/OnePlus/N200/res/values/config.xml
+++ b/OnePlus/N200/res/values/config.xml
@@ -5,9 +5,10 @@
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
     <bool name="config_automatic_brightness_available">true</bool>
 
+    <dimen name="status_bar_height">133px</dimen>
     <dimen name="status_bar_height_portrait">133px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">133px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/OnePlus/OP10Pro-SystemUI/res/values/config.xml b/OnePlus/OP10Pro-SystemUI/res/values/config.xml
index 36e0228..73f9928 100644
--- a/OnePlus/OP10Pro-SystemUI/res/values/config.xml
+++ b/OnePlus/OP10Pro-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">33px</dimen>
     <dimen name="status_bar_padding_end">80px</dimen>
     <dimen name="status_bar_header_height_keyguard">160px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">33px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">80px</dimen>
 </resources>
diff --git a/OnePlus/OP10Pro/res/values-land/config.xml b/OnePlus/OP10Pro/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/OnePlus/OP10Pro/res/values-land/config.xml
+++ b/OnePlus/OP10Pro/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OnePlus/OP10Pro/res/values/config.xml b/OnePlus/OP10Pro/res/values/config.xml
index 7f80c56..0a26c7f 100644
--- a/OnePlus/OP10Pro/res/values/config.xml
+++ b/OnePlus/OP10Pro/res/values/config.xml
@@ -8,9 +8,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">160px</dimen>
     <dimen name="status_bar_height_portrait">160px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">160px</dimen>
 
     <integer name="config_screenBrightnessDoze">3</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/OnePlus/OP6/res/values-land/notch.xml b/OnePlus/OP6/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/OnePlus/OP6/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/OnePlus/OP6/res/values/notch.xml b/OnePlus/OP6/res/values/notch.xml
index 4141502..667bd9b 100644
--- a/OnePlus/OP6/res/values/notch.xml
+++ b/OnePlus/OP6/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">80px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">80px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/OnePlus/OP6T/res/values-land/config.xml b/OnePlus/OP6T/res/values-land/config.xml
new file mode 100644
index 0000000..b0af112
--- /dev/null
+++ b/OnePlus/OP6T/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">80px</dimen>
+</resources>
diff --git a/OnePlus/OP6T/res/values/config.xml b/OnePlus/OP6T/res/values/config.xml
index 62a8488..e35a6a8 100644
--- a/OnePlus/OP6T/res/values/config.xml
+++ b/OnePlus/OP6T/res/values/config.xml
@@ -112,9 +112,10 @@
     </string>
 
     <!-- Height of the status bar -->
+    <dimen name="status_bar_height">80px</dimen>
     <dimen name="status_bar_height_portrait">80px</dimen>
     <dimen name="status_bar_height_landscape">80px</dimen>
-    
+
     <!-- Screen off delay
     <integer name="config_screen_off_delay">1800</integer> -->
 
diff --git a/OnePlus/OP8-SystemUI/res/values/config.xml b/OnePlus/OP8-SystemUI/res/values/config.xml
index d858296..59e33ed 100755
--- a/OnePlus/OP8-SystemUI/res/values/config.xml
+++ b/OnePlus/OP8-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">132px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/OnePlus/OP8/res/values-land/config.xml b/OnePlus/OP8/res/values-land/config.xml
index 9d6de4c..80d82e4 100755
--- a/OnePlus/OP8/res/values-land/config.xml
+++ b/OnePlus/OP8/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/OnePlus/OP8/res/values/config.xml b/OnePlus/OP8/res/values/config.xml
index 540ee59..bf9e807 100755
--- a/OnePlus/OP8/res/values/config.xml
+++ b/OnePlus/OP8/res/values/config.xml
@@ -8,9 +8,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">132px</dimen>
     <dimen name="status_bar_height_portrait">132px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">132px</dimen>
 
     <integer name="config_screenBrightnessDoze">3</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Realme/6/res/values-land/config.xml b/Realme/6/res/values-land/config.xml
new file mode 100644
index 0000000..606eb19
--- /dev/null
+++ b/Realme/6/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>
diff --git a/Realme/6/res/values/notch.xml b/Realme/6/res/values/notch.xml
index 0deef0d..6062cf9 100644
--- a/Realme/6/res/values/notch.xml
+++ b/Realme/6/res/values/notch.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">110px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">110px</dimen>
-
     <!-- Corner Radius -->
     <dimen name="rounded_corner_radius">105px</dimen>
-
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">28.0dip</dimen>
-
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -544,0 L -544,115 L -382,115 L -382,0 Z</string>
-    </resources>
+</resources>
diff --git a/Realme/6i/res/values-land/notch.xml b/Realme/6i/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Realme/6i/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Realme/6i/res/values/notch.xml b/Realme/6i/res/values/notch.xml
index 0deef0d..6062cf9 100644
--- a/Realme/6i/res/values/notch.xml
+++ b/Realme/6i/res/values/notch.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">110px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">110px</dimen>
-
     <!-- Corner Radius -->
     <dimen name="rounded_corner_radius">105px</dimen>
-
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">28.0dip</dimen>
-
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M -544,0 L -544,115 L -382,115 L -382,0 Z</string>
-    </resources>
+</resources>
diff --git a/Realme/C2/res/values/dimens.xml b/Realme/C2/res/values/dimens.xml
index 40aeffe..88df3de 100644
--- a/Realme/C2/res/values/dimens.xml
+++ b/Realme/C2/res/values/dimens.xml
@@ -7,5 +7,6 @@
     <dimen name="rounded_corner_radius">10.0px</dimen>
     <dimen name="rounded_corner_radius_bottom">10.0px</dimen>
     <dimen name="rounded_corner_radius_top">10.0px</dimen>
+    <dimen name="status_bar_height">25.5dip</dimen>
     <dimen name="status_bar_height_portrait">25.5dip</dimen>
 </resources>
diff --git a/Realme/Q3/res/values-land/config.xml b/Realme/Q3/res/values-land/config.xml
index 9d6de4c..1394d3f 100644
--- a/Realme/Q3/res/values-land/config.xml
+++ b/Realme/Q3/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">110.0px</dimen>
+    <dimen name="quick_qs_offset_height">110.0px</dimen>
 </resources>
diff --git a/Realme/Q3/res/values/config.xml b/Realme/Q3/res/values/config.xml
index 999e539..f792a8a 100644
--- a/Realme/Q3/res/values/config.xml
+++ b/Realme/Q3/res/values/config.xml
@@ -6,9 +6,10 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
 
-    <dimen name="status_bar_height_landscape">110.0px</dimen>
+    <dimen name="status_bar_height">110.0px</dimen>
     <dimen name="status_bar_height_portrait">110.0px</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="status_bar_height_landscape">110.0px</dimen>
+    <dimen name="quick_qs_offset_height">110.0px</dimen>
 
     <integer name="config_screenBrightnessDoze">17</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Realme/RMX2117-SystemUI/res/values/config.xml b/Realme/RMX2117-SystemUI/res/values/config.xml
index 051228b..5414023 100644
--- a/Realme/RMX2117-SystemUI/res/values/config.xml
+++ b/Realme/RMX2117-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">133px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/Realme/RMX2117/res/values-land/config.xml b/Realme/RMX2117/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Realme/RMX2117/res/values-land/config.xml
+++ b/Realme/RMX2117/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Realme/RMX2117/res/values/config.xml b/Realme/RMX2117/res/values/config.xml
index 8f63e06..7a1e0ec 100644
--- a/Realme/RMX2117/res/values/config.xml
+++ b/Realme/RMX2117/res/values/config.xml
@@ -3,9 +3,10 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">133px</dimen>
     <dimen name="status_bar_height_portrait">133px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">133px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/Realme/RMX3366-SystemUI/res/values/config.xml b/Realme/RMX3366-SystemUI/res/values/config.xml
index d858296..59e33ed 100644
--- a/Realme/RMX3366-SystemUI/res/values/config.xml
+++ b/Realme/RMX3366-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">132px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">25px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
 </resources>
diff --git a/Realme/RMX3366/res/values-land/config.xml b/Realme/RMX3366/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Realme/RMX3366/res/values-land/config.xml
+++ b/Realme/RMX3366/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Realme/RMX3366/res/values/config.xml b/Realme/RMX3366/res/values/config.xml
index 540ee59..bf9e807 100644
--- a/Realme/RMX3366/res/values/config.xml
+++ b/Realme/RMX3366/res/values/config.xml
@@ -8,9 +8,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">132px</dimen>
     <dimen name="status_bar_height_portrait">132px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">132px</dimen>
 
     <integer name="config_screenBrightnessDoze">3</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Samsung/A20/res/values/dimens.xml b/Samsung/A20/res/values/dimens.xml
index 5727f7c..113aee3 100644
--- a/Samsung/A20/res/values/dimens.xml
+++ b/Samsung/A20/res/values/dimens.xml
@@ -5,5 +5,6 @@
     <dimen name="rounded_corner_radius_top">100.73999px</dimen>
 
     <!-- Height of the status bar -->
+    <dimen name="status_bar_height">53.0px</dimen>
     <dimen name="status_bar_height_portrait">53.0px</dimen>
 </resources>
diff --git a/Samsung/A20s-SystemUI/res/values/config.xml b/Samsung/A20s-SystemUI/res/values/config.xml
index c290e3d..af5df80 100644
--- a/Samsung/A20s-SystemUI/res/values/config.xml
+++ b/Samsung/A20s-SystemUI/res/values/config.xml
@@ -3,7 +3,7 @@
     <dimen name="status_bar_padding_start">45px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">35dp</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">45px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
     <dimen name="rounded_corner_content_padding">4dp</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Samsung/A20s/res/values-land/dimens.xml b/Samsung/A20s/res/values-land/dimens.xml
new file mode 100644
index 0000000..54d279d
--- /dev/null
+++ b/Samsung/A20s/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24.0dip</dimen>
+</resources>
diff --git a/Samsung/A20s/res/values/dimens.xml b/Samsung/A20s/res/values/dimens.xml
index 1284f93..146b740 100644
--- a/Samsung/A20s/res/values/dimens.xml
+++ b/Samsung/A20s/res/values/dimens.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="rounded_corner_radius">0.0dip</dimen>
-    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="status_bar_height">30.0dip</dimen>
     <dimen name="status_bar_height_portrait">30.0dip</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
     <dimen name="quick_qs_offset_height">46.0dip</dimen>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Samsung/A30/res/values-land/dimens.xml b/Samsung/A30/res/values-land/dimens.xml
new file mode 100644
index 0000000..54d279d
--- /dev/null
+++ b/Samsung/A30/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24.0dip</dimen>
+</resources>
diff --git a/Samsung/A30/res/values/dimens.xml b/Samsung/A30/res/values/dimens.xml
index b5f452e..8510d3f 100644
--- a/Samsung/A30/res/values/dimens.xml
+++ b/Samsung/A30/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="rounded_corner_radius">151.0px</dimen>
-    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="status_bar_height">83.0px</dimen>
     <dimen name="status_bar_height_portrait">83.0px</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
 </resources>
diff --git a/Samsung/A40/res/values-land/notch.xml b/Samsung/A40/res/values-land/notch.xml
new file mode 100644
index 0000000..54d279d
--- /dev/null
+++ b/Samsung/A40/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24.0dip</dimen>
+</resources>
diff --git a/Samsung/A40/res/values/notch.xml b/Samsung/A40/res/values/notch.xml
index b23486b..9214d5a 100644
--- a/Samsung/A40/res/values/notch.xml
+++ b/Samsung/A40/res/values/notch.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="rounded_corner_radius">0px</dimen>
-    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="status_bar_height">86.0px</dimen>
     <dimen name="status_bar_height_portrait">86.0px</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
     <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
     <string name="config_mainBuiltInDisplayCutout">M38,0c-4.2,0-5.6,0.3-5.6,0.3c-2.6,0.4-4.6,1.5-4.6,1.5c-3.3,1.6-4.6,4.8-4.6,4.8 c-1,1.8-1.8,5.9-1.8,5.9C18.8,21.8,10.2,28.7,0,28.7s-18.7-6.9-21.3-16.2c0,0-0.9-4.1-1.8-5.9 c0,0-1.4-3.1-4.6-4.8c0,0-2.1-1.1-4.6-1.5C-32.4,0.3,-33.8,0,-38,0Z @dp</string>
 </resources>
diff --git a/Samsung/A50/res/values-land/dimens.xml b/Samsung/A50/res/values-land/dimens.xml
new file mode 100644
index 0000000..37570d8
--- /dev/null
+++ b/Samsung/A50/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dip</dimen>
+</resources>
diff --git a/Samsung/A50/res/values/dimens.xml b/Samsung/A50/res/values/dimens.xml
index 7d21797..92241ab 100644
--- a/Samsung/A50/res/values/dimens.xml
+++ b/Samsung/A50/res/values/dimens.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="config_mainBuiltInDisplayCutout">M36.95,0C26.35,0,24.15,3.8,23.15,9.8 l-0.1,0.7c-1.7,9.6-9.3,17.2-18.9,18.9c-12.7,2.2-24.8-6.2-27-18.9 c0,0-0.1-0.7-0.1-0.7C-24.15,3.8,-26.25,0,-36.95,0Z @dp</string>
     <dimen name="rounded_corner_radius">112px</dimen>
+    <dimen name="status_bar_height">83px</dimen>
     <dimen name="status_bar_height_portrait">83px</dimen>
     <dimen name="status_bar_height_landscape">24dip</dimen>
 </resources>
diff --git a/Samsung/A7/res/values-land/dimens.xml b/Samsung/A7/res/values-land/dimens.xml
new file mode 100644
index 0000000..54d279d
--- /dev/null
+++ b/Samsung/A7/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24.0dip</dimen>
+</resources>
diff --git a/Samsung/A7/res/values/dimens.xml b/Samsung/A7/res/values/dimens.xml
index 9b5b5a8..d7b96f7 100755
--- a/Samsung/A7/res/values/dimens.xml
+++ b/Samsung/A7/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="rounded_corner_radius">45.0px</dimen>
-    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="status_bar_height">69.0px</dimen>
     <dimen name="status_bar_height_portrait">69.0px</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
 </resources>
diff --git a/Samsung/A70/res/values-land/dimens.xml b/Samsung/A70/res/values-land/dimens.xml
new file mode 100644
index 0000000..e7b3629
--- /dev/null
+++ b/Samsung/A70/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">25.0dip</dimen>
+</resources>
diff --git a/Samsung/A70/res/values/dimens.xml b/Samsung/A70/res/values/dimens.xml
index 5ea59f4..1a1f885 100644
--- a/Samsung/A70/res/values/dimens.xml
+++ b/Samsung/A70/res/values/dimens.xml
@@ -6,6 +6,8 @@
     <!-- Radius of the software rounded corners at the bottom of the display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
     <dimen name="rounded_corner_radius_bottom">60.0px</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">77px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">77px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Samsung/A80/res/values-land/config.xml b/Samsung/A80/res/values-land/config.xml
new file mode 100644
index 0000000..e7b3629
--- /dev/null
+++ b/Samsung/A80/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">25.0dip</dimen>
+</resources>
diff --git a/Samsung/A80/res/values/dimens.xml b/Samsung/A80/res/values/dimens.xml
index 393b0bd..b637150 100644
--- a/Samsung/A80/res/values/dimens.xml
+++ b/Samsung/A80/res/values/dimens.xml
@@ -6,6 +6,8 @@
     <!-- Radius of the software rounded corners at the bottom of the display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
     <dimen name="rounded_corner_radius_bottom">60.0px</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">60px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">60px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Samsung/S20fe/res/values-land/config.xml b/Samsung/S20fe/res/values-land/config.xml
new file mode 100644
index 0000000..032f710
--- /dev/null
+++ b/Samsung/S20fe/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">26.0dp</dimen>
+</resources>
diff --git a/Samsung/S20fe/res/values/configs.xml b/Samsung/S20fe/res/values/config.xml
similarity index 99%
rename from Samsung/S20fe/res/values/configs.xml
rename to Samsung/S20fe/res/values/config.xml
index d17abbe..ae78de2 100644
--- a/Samsung/S20fe/res/values/configs.xml
+++ b/Samsung/S20fe/res/values/config.xml
@@ -1050,11 +1050,11 @@
 	<bool name="config_automatic_brightness_available">true</bool>
 	<bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
 	<bool name="config_supportDoubleTapWake">true</bool>
-	
-    <dimen name="status_bar_height_landscape">26.0dp</dimen>
-    <dimen name="status_bar_height_portrait">88.0px</dimen>
-	<dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
 
+    <dimen name="status_bar_height">88.0px</dimen>
+    <dimen name="status_bar_height_portrait">88.0px</dimen>
+    <dimen name="status_bar_height_landscape">26.0dp</dimen>
+	<dimen name="quick_qs_offset_height">88.0px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">0</integer>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Samsung/a51x/res/values-land/config.xml b/Samsung/a51x/res/values-land/config.xml
new file mode 100644
index 0000000..d89c7e6
--- /dev/null
+++ b/Samsung/a51x/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28dp</dimen>
+</resources>
diff --git a/Samsung/a51x/res/values/config.xml b/Samsung/a51x/res/values/config.xml
index c22285c..3fbabf3 100644
--- a/Samsung/a51x/res/values/config.xml
+++ b/Samsung/a51x/res/values/config.xml
@@ -3,6 +3,7 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">93px</dimen>
     <dimen name="status_bar_height_portrait">93px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
diff --git a/Samsung/a60q/res/values-land/config.xml b/Samsung/a60q/res/values-land/config.xml
new file mode 100644
index 0000000..d89c7e6
--- /dev/null
+++ b/Samsung/a60q/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28dp</dimen>
+</resources>
diff --git a/Samsung/a60q/res/values/config.xml b/Samsung/a60q/res/values/config.xml
index 453f612..d92e3ec 100644
--- a/Samsung/a60q/res/values/config.xml
+++ b/Samsung/a60q/res/values/config.xml
@@ -3,6 +3,7 @@
     <bool name="config_useDevInputEventForAudioJack">true</bool>
     <bool name="config_showNavigationBar">true</bool>
 
+    <dimen name="status_bar_height">111.5px</dimen>
     <dimen name="status_bar_height_portrait">111.5px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
diff --git a/Samsung/d1q-SystemUI/res/values-land/config.xml b/Samsung/d1q-SystemUI/res/values-land/config.xml
new file mode 100644
index 0000000..0356339
--- /dev/null
+++ b/Samsung/d1q-SystemUI/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
+</resources>
diff --git a/Samsung/d1q-SystemUI/res/values/config.xml b/Samsung/d1q-SystemUI/res/values/config.xml
index 4458916..63d598c 100644
--- a/Samsung/d1q-SystemUI/res/values/config.xml
+++ b/Samsung/d1q-SystemUI/res/values/config.xml
@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">36px</dimen>
     <dimen name="status_bar_padding_end">36px</dimen>
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="status_bar_header_height_keyguard">108px</dimen>
+    <dimen name="keyguard_carrier_text_margin">36px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">36px</dimen>
 </resources>
diff --git a/Samsung/d1q/res/values-land/config.xml b/Samsung/d1q/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Samsung/d1q/res/values-land/config.xml
+++ b/Samsung/d1q/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Samsung/d1q/res/values/config.xml b/Samsung/d1q/res/values/config.xml
index 35529c1..43d5c2e 100644
--- a/Samsung/d1q/res/values/config.xml
+++ b/Samsung/d1q/res/values/config.xml
@@ -4,9 +4,10 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_automatic_brightness_available">true</bool>
 
+    <dimen name="status_bar_height">108px</dimen>
     <dimen name="status_bar_height_portrait">108px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">108px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/Samsung/d1x-SystemUI/res/values-land/config.xml b/Samsung/d1x-SystemUI/res/values-land/config.xml
new file mode 100644
index 0000000..0356339
--- /dev/null
+++ b/Samsung/d1x-SystemUI/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_header_height_keyguard">28dp</dimen>
+</resources>
diff --git a/Samsung/d1x-SystemUI/res/values/config.xml b/Samsung/d1x-SystemUI/res/values/config.xml
index 4458916..63d598c 100644
--- a/Samsung/d1x-SystemUI/res/values/config.xml
+++ b/Samsung/d1x-SystemUI/res/values/config.xml
@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">36px</dimen>
     <dimen name="status_bar_padding_end">36px</dimen>
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="status_bar_header_height_keyguard">108px</dimen>
+    <dimen name="keyguard_carrier_text_margin">36px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">36px</dimen>
 </resources>
diff --git a/Samsung/d1x/res/values-land/config.xml b/Samsung/d1x/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Samsung/d1x/res/values-land/config.xml
+++ b/Samsung/d1x/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Samsung/d1x/res/values/config.xml b/Samsung/d1x/res/values/config.xml
index 35529c1..43d5c2e 100644
--- a/Samsung/d1x/res/values/config.xml
+++ b/Samsung/d1x/res/values/config.xml
@@ -4,9 +4,10 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_automatic_brightness_available">true</bool>
 
+    <dimen name="status_bar_height">108px</dimen>
     <dimen name="status_bar_height_portrait">108px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">108px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/Samsung/starqltekdi-SystemUI/res/values/config.xml b/Samsung/starqltekdi-SystemUI/res/values/config.xml
index a4beb20..8757644 100644
--- a/Samsung/starqltekdi-SystemUI/res/values/config.xml
+++ b/Samsung/starqltekdi-SystemUI/res/values/config.xml
@@ -3,6 +3,6 @@
     <dimen name="status_bar_padding_start">66px</dimen>
     <dimen name="status_bar_padding_end">66px</dimen>
     <dimen name="status_bar_header_height_keyguard">110px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">66px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">66px</dimen>
 </resources>
diff --git a/Samsung/starqltekdi/res/values-land/config.xml b/Samsung/starqltekdi/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Samsung/starqltekdi/res/values-land/config.xml
+++ b/Samsung/starqltekdi/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Samsung/starqltekdi/res/values/config.xml b/Samsung/starqltekdi/res/values/config.xml
index a4a3286..acd93b8 100644
--- a/Samsung/starqltekdi/res/values/config.xml
+++ b/Samsung/starqltekdi/res/values/config.xml
@@ -4,9 +4,10 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_intrusiveNotificationLed">true</bool>
 
+    <dimen name="status_bar_height">110px</dimen>
     <dimen name="status_bar_height_portrait">110px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">110px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
diff --git a/Sharp/S2/res/values-land/notch.xml b/Sharp/S2/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Sharp/S2/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Sharp/S2/res/values/notch.xml b/Sharp/S2/res/values/notch.xml
index 6b1d992..c2529f9 100644
--- a/Sharp/S2/res/values/notch.xml
+++ b/Sharp/S2/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">121.0px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">121.0px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Tecno/Camon11/res/values-land/notch.xml b/Tecno/Camon11/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Tecno/Camon11/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Tecno/Camon11/res/values/notch.xml b/Tecno/Camon11/res/values/notch.xml
index e233f73..0c39760 100644
--- a/Tecno/Camon11/res/values/notch.xml
+++ b/Tecno/Camon11/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">60px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">60px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Tecno/Spark5/res/values-land/dimens.xml b/Tecno/Spark5/res/values-land/dimens.xml
new file mode 100644
index 0000000..606eb19
--- /dev/null
+++ b/Tecno/Spark5/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">28.0dip</dimen>
+</resources>
diff --git a/Tecno/Spark5/res/values/dimens.xml b/Tecno/Spark5/res/values/dimens.xml
index ee5edef..20c4806 100644
--- a/Tecno/Spark5/res/values/dimens.xml
+++ b/Tecno/Spark5/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="quick_qs_offset_height">40.0dip</dimen>
-    <dimen name="status_bar_height_landscape">28.0dip</dimen>
+    <dimen name="status_bar_height">40.0dip</dimen>
     <dimen name="status_bar_height_portrait">40.0dip</dimen>
-</resources>
\ No newline at end of file
+    <dimen name="status_bar_height_landscape">28.0dip</dimen>
+</resources>
diff --git a/Teracube/2e/res/values/config.xml b/Teracube/2e/res/values/config.xml
index e54fd8e..1170dbf 100644
--- a/Teracube/2e/res/values/config.xml
+++ b/Teracube/2e/res/values/config.xml
@@ -27,6 +27,7 @@
      -->
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
     <!-- Height of the status bar -->
+    <dimen name="status_bar_height">26dp</dimen>
     <dimen name="status_bar_height_portrait">26dp</dimen>
     <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
     <dimen name="quick_qs_offset_height">36dp</dimen>
diff --git a/Teracube/v7101o/res/values-land/dimens.xml b/Teracube/v7101o/res/values-land/dimens.xml
new file mode 100644
index 0000000..3fe98ea
--- /dev/null
+++ b/Teracube/v7101o/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">81.0px</dimen>
+</resources>
diff --git a/Teracube/v7101o/res/values/dimens.xml b/Teracube/v7101o/res/values/dimens.xml
index b444fda..adc29f1 100644
--- a/Teracube/v7101o/res/values/dimens.xml
+++ b/Teracube/v7101o/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="status_bar_height">81.0px</dimen>
     <dimen name="status_bar_height_portrait">81.0px</dimen>
     <dimen name="status_bar_height_landscape">81.0px</dimen>
     <dimen name="quick_qs_offset_height">81.0px</dimen>
diff --git a/Umidigi/Power/res/values-land/notch.xml b/Umidigi/Power/res/values-land/notch.xml
new file mode 100644
index 0000000..37570d8
--- /dev/null
+++ b/Umidigi/Power/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dip</dimen>
+</resources>
diff --git a/Umidigi/Power/res/values/notch.xml b/Umidigi/Power/res/values/notch.xml
index f78a7e2..b351c30 100644
--- a/Umidigi/Power/res/values/notch.xml
+++ b/Umidigi/Power/res/values/notch.xml
@@ -17,9 +17,11 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">28.0dip</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">28.0dip</dimen>
     <!-- Height of the status bar -->
     <dimen name="status_bar_height_landscape">24dip</dimen>
     <string name="config_mainBuiltInDisplayCutout">M 0,0 L -30, 0 L -14.540446283, 20.0595537175 C -10.0582133885, 26.0178661152 -5.6, 27.5 -1.0, 28.0 L 1.0, 28.0 C 5.6, 27.5 10.0582133885, 26.0178661152 14.540446283, 20.0595537175 L 30, 0 Z @dp</string>
-    </resources>
+</resources>
diff --git a/Vivo/Y20/res/values-land/configs.xml b/Vivo/Y20/res/values-land/configs.xml
index 5a88213..6688fa7 100644
--- a/Vivo/Y20/res/values-land/configs.xml
+++ b/Vivo/Y20/res/values-land/configs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-		<dimen name="status_bar_height_landscape">24.0dip</dimen>
-		<dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">24.0dip</dimen>
+    <dimen name="quick_qs_offset_height">24.0dip</dimen>
 </resources>
diff --git a/Vivo/Y20/res/values/configs.xml b/Vivo/Y20/res/values/configs.xml
index 63d5860..4f136cd 100644
--- a/Vivo/Y20/res/values/configs.xml
+++ b/Vivo/Y20/res/values/configs.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-		<bool name="config_automatic_brightness_available">true</bool>
+    <bool name="config_automatic_brightness_available">true</bool>
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
 
-		<dimen name="status_bar_height_portrait">24.0dip</dimen>
-		<dimen name="status_bar_height_landscape">24.0dip</dimen>
-		<dimen name="quick_qs_offset_height">24.0dip</dimen>
+    <dimen name="status_bar_height">24.0dip</dimen>
+    <dimen name="status_bar_height_portrait">24.0dip</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="quick_qs_offset_height">24.0dip</dimen>
 </resources>
diff --git a/Vsmart/Joy3/res/values-land/config.xml b/Vsmart/Joy3/res/values-land/config.xml
new file mode 100644
index 0000000..3b21abe
--- /dev/null
+++ b/Vsmart/Joy3/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">32.0dip</dimen>
+</resources>
diff --git a/Vsmart/Joy3/res/values/config.xml b/Vsmart/Joy3/res/values/config.xml
index b22b2c4..2e36d6d 100644
--- a/Vsmart/Joy3/res/values/config.xml
+++ b/Vsmart/Joy3/res/values/config.xml
@@ -17,6 +17,7 @@
     <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool>
 
     <!-- dimens.xml files-->
+    <dimen name="status_bar_height">32.0dip</dimen>
     <dimen name="status_bar_height_portrait">32.0dip</dimen>
     <dimen name="status_bar_height_landscape">32.0dip</dimen>
 
diff --git a/Vsmart/Live/res/values-land/config.xml b/Vsmart/Live/res/values-land/config.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Vsmart/Live/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Vsmart/Live/res/values/config.xml b/Vsmart/Live/res/values/config.xml
index 0a08657..eb76a3d 100644
--- a/Vsmart/Live/res/values/config.xml
+++ b/Vsmart/Live/res/values/config.xml
@@ -14,8 +14,9 @@
 	<bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
 	<bool name="config_useDevInputEventForAudioJack">true</bool>
 	<dimen name="rounded_corner_radius">105.0px</dimen>
-	<dimen name="status_bar_height_landscape">24dp</dimen>
+	<dimen name="status_bar_height">91px</dimen>
 	<dimen name="status_bar_height_portrait">91px</dimen>
+	<dimen name="status_bar_height_landscape">24dp</dimen>
 	<fraction name="config_autoBrightnessAdjustmentMaxGamma">200.0%</fraction>
 	<fraction name="config_maximumScreenDimRatio">29.999996%</fraction>
 	<integer name="config_bluetooth_idle_cur_ma">3</integer>
diff --git a/Xiaomi/Civi-SystemUI/res/values/config.xml b/Xiaomi/Civi-SystemUI/res/values/config.xml
index 2b2f5a8..0f75057 100644
--- a/Xiaomi/Civi-SystemUI/res/values/config.xml
+++ b/Xiaomi/Civi-SystemUI/res/values/config.xml
@@ -3,7 +3,7 @@
     <dimen name="status_bar_padding_start">50px</dimen>
     <dimen name="status_bar_padding_end">50px</dimen>
     <dimen name="status_bar_header_height_keyguard">125px</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">50px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">50px</dimen>
     <dimen name="rounded_corner_content_padding">4dp</dimen>
 </resources>
diff --git a/Xiaomi/Civi/res/values-land/config.xml b/Xiaomi/Civi/res/values-land/config.xml
index 9d6de4c..80d82e4 100644
--- a/Xiaomi/Civi/res/values-land/config.xml
+++ b/Xiaomi/Civi/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Xiaomi/Civi/res/values/config.xml b/Xiaomi/Civi/res/values/config.xml
index 2b4fb01..f55ac27 100644
--- a/Xiaomi/Civi/res/values/config.xml
+++ b/Xiaomi/Civi/res/values/config.xml
@@ -7,9 +7,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">125px</dimen>
     <dimen name="status_bar_height_portrait">125px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">125px</dimen>
 
     <integer name="config_screenBrightnessDoze">5</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Xiaomi/Mi8/res/values-land/notch.xml b/Xiaomi/Mi8/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi8/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi8/res/values/notch.xml b/Xiaomi/Mi8/res/values/notch.xml
index 5879f72..74067c8 100644
--- a/Xiaomi/Mi8/res/values/notch.xml
+++ b/Xiaomi/Mi8/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/Mi8EE/res/values-land/notch.xml b/Xiaomi/Mi8EE/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi8EE/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi8EE/res/values/notch.xml b/Xiaomi/Mi8EE/res/values/notch.xml
index 5879f72..74067c8 100644
--- a/Xiaomi/Mi8EE/res/values/notch.xml
+++ b/Xiaomi/Mi8EE/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/Mi8Lite/res/values-land/notch.xml b/Xiaomi/Mi8Lite/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi8Lite/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi8Lite/res/values/notch.xml b/Xiaomi/Mi8Lite/res/values/notch.xml
index 0fb9eee..a71a14b 100644
--- a/Xiaomi/Mi8Lite/res/values/notch.xml
+++ b/Xiaomi/Mi8Lite/res/values/notch.xml
@@ -17,9 +17,11 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -160,0 L -160,81 L 160,81 L 160,0 Z</string>
-    </resources>
+</resources>
diff --git a/Xiaomi/Mi8Pro/res/values-land/notch.xml b/Xiaomi/Mi8Pro/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi8Pro/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi8Pro/res/values/notch.xml b/Xiaomi/Mi8Pro/res/values/notch.xml
index 5879f72..74067c8 100644
--- a/Xiaomi/Mi8Pro/res/values/notch.xml
+++ b/Xiaomi/Mi8Pro/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/Mi8SE/res/values-land/notch.xml b/Xiaomi/Mi8SE/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi8SE/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi8SE/res/values/notch.xml b/Xiaomi/Mi8SE/res/values/notch.xml
index ab0425b..744142a 100644
--- a/Xiaomi/Mi8SE/res/values/notch.xml
+++ b/Xiaomi/Mi8SE/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">85px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">85px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/Mi9/res/values-land/notch.xml b/Xiaomi/Mi9/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi9/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi9/res/values/notch.xml b/Xiaomi/Mi9/res/values/notch.xml
index 19414dd..020bed0 100644
--- a/Xiaomi/Mi9/res/values/notch.xml
+++ b/Xiaomi/Mi9/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">74px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">74px</dimen>
     <!-- Height of the status bar in landscape -->
@@ -28,4 +30,4 @@
     <!-- Radius of the software rounded corners at the bottom of the display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
     <dimen name="rounded_corner_radius_bottom">110px</dimen>
-    </resources>
+</resources>
diff --git a/Xiaomi/Mi9SE/res/values-land/notch.xml b/Xiaomi/Mi9SE/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Mi9SE/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Mi9SE/res/values/notch.xml b/Xiaomi/Mi9SE/res/values/notch.xml
index d7fcc85..6bd1fee 100644
--- a/Xiaomi/Mi9SE/res/values/notch.xml
+++ b/Xiaomi/Mi9SE/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">79px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">79px</dimen>
     <!-- Height of the status bar in landscape -->
@@ -28,4 +30,4 @@
     <!-- Radius of the software rounded corners at the bottom of the display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
     <dimen name="rounded_corner_radius_bottom">126px</dimen>
-    </resources>
+</resources>
diff --git a/Xiaomi/MiA2Lite/res/values-land/notch.xml b/Xiaomi/MiA2Lite/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/MiA2Lite/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/MiA2Lite/res/values/notch.xml b/Xiaomi/MiA2Lite/res/values/notch.xml
index 3cf9c5b..9421382 100644
--- a/Xiaomi/MiA2Lite/res/values/notch.xml
+++ b/Xiaomi/MiA2Lite/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">89px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">89px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/MiPlay/res/values-land/notch.xml b/Xiaomi/MiPlay/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/MiPlay/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/MiPlay/res/values/notch.xml b/Xiaomi/MiPlay/res/values/notch.xml
index a5f97e2..51ced66 100644
--- a/Xiaomi/MiPlay/res/values/notch.xml
+++ b/Xiaomi/MiPlay/res/values/notch.xml
@@ -17,8 +17,10 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">110px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">110px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
-    </resources>
+</resources>
diff --git a/Xiaomi/PocoF1/res/values-land/notch.xml b/Xiaomi/PocoF1/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/PocoF1/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/PocoF1/res/values/notch.xml b/Xiaomi/PocoF1/res/values/notch.xml
index 3adf0d2..63b2c5e 100644
--- a/Xiaomi/PocoF1/res/values/notch.xml
+++ b/Xiaomi/PocoF1/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">90px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">90px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/Redmi10X5G/res/values/config.xml b/Xiaomi/Redmi10X5G/res/values/config.xml
index a3c355f..7a45f12 100644
--- a/Xiaomi/Redmi10X5G/res/values/config.xml
+++ b/Xiaomi/Redmi10X5G/res/values/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--
-	
+
 		Config From MIUI V12.5.2.0 China Version
-	
+
 	-->
     <integer-array name="config_autoBrightnessDisplayValuesNits">
         <item>4</item>
@@ -269,7 +269,7 @@
     <bool name="config_showNavigationBar">true</bool>
     <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
     <bool name="config_sustainedPerformanceModeSupported">false</bool>
-    
+
     <bool name="config_enableBurnInProtection">false</bool>
     <bool name="config_suspendWhenScreenOffDueToProximity">false</bool>
 
@@ -287,6 +287,7 @@
     <bool name="config_dynamic_bind_ims">true</bool>
 
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">false</bool>
+    <dimen name="status_bar_height">24dp</dimen>
     <dimen name="status_bar_height_portrait">24dp</dimen>
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>
     <fraction name="config_maximumScreenDimRatio">29.999996%</fraction>
diff --git a/Xiaomi/Redmi6Pro/res/values-land/notch.xml b/Xiaomi/Redmi6Pro/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/Redmi6Pro/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/Redmi6Pro/res/values/notch.xml b/Xiaomi/Redmi6Pro/res/values/notch.xml
index f53225a..eb48890 100644
--- a/Xiaomi/Redmi6Pro/res/values/notch.xml
+++ b/Xiaomi/Redmi6Pro/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">94px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">94px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/Redmi7onc/res/values/config.xml b/Xiaomi/Redmi7onc/res/values/config.xml
index c84480f..1e94dbb 100644
--- a/Xiaomi/Redmi7onc/res/values/config.xml
+++ b/Xiaomi/Redmi7onc/res/values/config.xml
@@ -99,6 +99,7 @@
          <dimen name="quick_qs_offset_height">55px</dimen>
 
        -->
+    <dimen name="status_bar_height">80px</dimen>
     <dimen name="status_bar_height_portrait">80px</dimen>
     <dimen name="quick_qs_offset_height">80px</dimen>
 
diff --git a/Xiaomi/Redmi8/res/values-land/config.xml b/Xiaomi/Redmi8/res/values-land/config.xml
new file mode 100644
index 0000000..54d279d
--- /dev/null
+++ b/Xiaomi/Redmi8/res/values-land/config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24.0dip</dimen>
+</resources>
diff --git a/Xiaomi/Redmi8/res/values/config.xml b/Xiaomi/Redmi8/res/values/config.xml
index 9348dcc..e4384a5 100644
--- a/Xiaomi/Redmi8/res/values/config.xml
+++ b/Xiaomi/Redmi8/res/values/config.xml
@@ -1,176 +1,175 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <integer-array name="config_autoBrightnessLcdBacklightValues">
-	<item>17</item>
-	<item>21</item>
-	<item>40</item>
-	<item>77</item>
-	<item>111</item>
-	<item>144</item>
-	<item>175</item>
-	<item>245</item>
-	<item>302</item>
-	<item>348</item>
-	<item>382</item>
-	<item>404</item>
-	<item>406</item>
-	<item>407</item>
-	<item>408</item>
-	<item>409</item>
-	<item>412</item>
-	<item>414</item>
-	<item>416</item>
-	<item>417</item>
-	<item>419</item>
-	<item>420</item>
-	<item>423</item>
-	<item>426</item>
-	<item>428</item>
-	<item>432</item>
-	<item>442</item>
-	<item>449</item>
-	<item>456</item>
-	<item>458</item>
-	<item>466</item>
-	<item>472</item>
-	<item>479</item>
-	<item>486</item>
-	<item>494</item>
-	<item>500</item>
-	<item>507</item>
-	<item>516</item>
-	<item>522</item>
-	<item>530</item>
-	<item>536</item>
-	<item>545</item>
-	<item>550</item>
-	<item>559</item>
-	<item>565</item>
-	<item>674</item>
-	<item>783</item>
-	<item>905</item>
-	<item>1028</item>
-	<item>1152</item>
-	<item>1284</item>
-	<item>1418</item>
-	<item>1600</item>
-	<item>1760</item>
-	<item>1900</item>
-	<item>2000</item>
-	<item>2047</item>
-	<item>2047</item>
-  </integer-array>
+    <integer-array name="config_autoBrightnessLcdBacklightValues">
+        <item>17</item>
+        <item>21</item>
+        <item>40</item>
+        <item>77</item>
+        <item>111</item>
+        <item>144</item>
+        <item>175</item>
+        <item>245</item>
+        <item>302</item>
+        <item>348</item>
+        <item>382</item>
+        <item>404</item>
+        <item>406</item>
+        <item>407</item>
+        <item>408</item>
+        <item>409</item>
+        <item>412</item>
+        <item>414</item>
+        <item>416</item>
+        <item>417</item>
+        <item>419</item>
+        <item>420</item>
+        <item>423</item>
+        <item>426</item>
+        <item>428</item>
+        <item>432</item>
+        <item>442</item>
+        <item>449</item>
+        <item>456</item>
+        <item>458</item>
+        <item>466</item>
+        <item>472</item>
+        <item>479</item>
+        <item>486</item>
+        <item>494</item>
+        <item>500</item>
+        <item>507</item>
+        <item>516</item>
+        <item>522</item>
+        <item>530</item>
+        <item>536</item>
+        <item>545</item>
+        <item>550</item>
+        <item>559</item>
+        <item>565</item>
+        <item>674</item>
+        <item>783</item>
+        <item>905</item>
+        <item>1028</item>
+        <item>1152</item>
+        <item>1284</item>
+        <item>1418</item>
+        <item>1600</item>
+        <item>1760</item>
+        <item>1900</item>
+        <item>2000</item>
+        <item>2047</item>
+        <item>2047</item>
+    </integer-array>
 
-  <integer-array name="config_autoBrightnessLevels">
-	<item>1</item>
-	<item>2</item>
-	<item>4</item>
-	<item>6</item>
-	<item>8</item>
-	<item>10</item>
-	<item>15</item>
-	<item>20</item>
-	<item>25</item>
-	<item>30</item>
-	<item>35</item>
-	<item>40</item>
-	<item>45</item>
-	<item>50</item>
-	<item>55</item>
-	<item>60</item>
-	<item>65</item>
-	<item>70</item>
-	<item>75</item>
-	<item>80</item>
-	<item>85</item>
-	<item>90</item>
-	<item>95</item>
-	<item>100</item>
-	<item>120</item>
-	<item>140</item>
-	<item>160</item>
-	<item>180</item>
-	<item>200</item>
-	<item>220</item>
-	<item>240</item>
-	<item>260</item>
-	<item>280</item>
-	<item>300</item>
-	<item>320</item>
-	<item>340</item>
-	<item>360</item>
-	<item>380</item>
-	<item>400</item>
-	<item>420</item>
-	<item>440</item>
-	<item>460</item>
-	<item>480</item>
-	<item>500</item>
-	<item>700</item>
-	<item>900</item>
-	<item>1100</item>
-	<item>1300</item>
-	<item>1500</item>
-	<item>1700</item>
-	<item>1900</item>
-	<item>2200</item>
-	<item>2500</item>
-	<item>3000</item>
-	<item>3500</item>
-	<item>4000</item>
-	<item>4500</item>
-  </integer-array>
+    <integer-array name="config_autoBrightnessLevels">
+        <item>1</item>
+        <item>2</item>
+        <item>4</item>
+        <item>6</item>
+        <item>8</item>
+        <item>10</item>
+        <item>15</item>
+        <item>20</item>
+        <item>25</item>
+        <item>30</item>
+        <item>35</item>
+        <item>40</item>
+        <item>45</item>
+        <item>50</item>
+        <item>55</item>
+        <item>60</item>
+        <item>65</item>
+        <item>70</item>
+        <item>75</item>
+        <item>80</item>
+        <item>85</item>
+        <item>90</item>
+        <item>95</item>
+        <item>100</item>
+        <item>120</item>
+        <item>140</item>
+        <item>160</item>
+        <item>180</item>
+        <item>200</item>
+        <item>220</item>
+        <item>240</item>
+        <item>260</item>
+        <item>280</item>
+        <item>300</item>
+        <item>320</item>
+        <item>340</item>
+        <item>360</item>
+        <item>380</item>
+        <item>400</item>
+        <item>420</item>
+        <item>440</item>
+        <item>460</item>
+        <item>480</item>
+        <item>500</item>
+        <item>700</item>
+        <item>900</item>
+        <item>1100</item>
+        <item>1300</item>
+        <item>1500</item>
+        <item>1700</item>
+        <item>1900</item>
+        <item>2200</item>
+        <item>2500</item>
+        <item>3000</item>
+        <item>3500</item>
+        <item>4000</item>
+        <item>4500</item>
+    </integer-array>
 
-	<bool name="config_showNavigationBar">true</bool>
-	<bool name="config_automatic_brightness_available">true</bool>
-	<bool name="config_setColorTransformAccelerated">true</bool>
-	<bool name="config_supportAudioSourceUnprocessed">true</bool>
-	<bool name="config_useDevInputEventForAudioJack">true</bool>
-	<bool name="skip_restoring_network_selection">true</bool>
-	<bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
-	<bool name="config_carrier_volte_available">true</bool>
-	<bool name="config_device_volte_available">true</bool>
-	<bool name="config_device_vt_available">true</bool>
-	<bool name="config_device_wfc_ims_available">true</bool>
-	<bool name="config_hotswapCapable">true</bool>
-	<bool name="config_lidControlsSleep">true</bool>
-	<bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
-	<bool name="config_wifi_background_scan_support">true</bool>
-	<bool name="config_wifi_batched_scan_supported">true</bool>
-	<bool name="config_wifi_dual_band_support">false</bool>
-	<bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
-	<bool name="config_dozePulsePickup">true</bool>
-	<bool name="config_displayBlanksAfterDoze">true</bool>
-	<bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
-	<bool name="config_supportDoubleTapWake">true</bool>
-	<bool name="config_supportSystemNavigationKeys">false</bool>
-	<bool name="config_enableBurnInProtection">true</bool>
-	<bool name="config_fillMainBuiltInDisplayCutout">false</bool>
-	<fraction name="config_autoBrightnessAdjustmentMaxGamma">100.0%</fraction>
-	<fraction name="config_maximumScreenDimRatio">30%</fraction>
-	<fraction name="config_screenAutoBrightnessDozeScaleFactor">100.0%</fraction>
-	<integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
-	<integer name="config_autoBrightnessDarkeningLightDebounce">1000</integer>
-	<integer name="config_screenBrightnessDark">1</integer>
-	<integer name="config_screenBrightnessDim">13</integer>
-	<integer name="config_screenBrightnessDoze">17</integer>
-	<integer name="config_screenBrightnessSettingDefault">536</integer>
-	<integer name="config_screenBrightnessSettingMaximum">2047</integer>
-	<integer name="config_screenBrightnessSettingMinimum">1</integer>
-	<integer name="config_bluetooth_idle_cur_ma">0</integer>
-	<integer name="config_bluetooth_operating_voltage_mv">3300</integer>
-	<integer name="config_bluetooth_rx_cur_ma">0</integer>
-	<integer name="config_bluetooth_tx_cur_ma">0</integer>
-	<integer name="config_shutdownBatteryTemperature">600</integer>
-	<integer name="config_autoBrightnessInitialLightSensorRate">-1</integer>
-	<integer name="config_autoBrightnessLightSensorRate">250</integer>
-	<integer name="config_screenBrightnessForVrSettingDefault">86</integer>
-	<integer name="config_screenBrightnessForVrSettingMaximum">255</integer>
-	<integer name="config_screenBrightnessForVrSettingMinimum">79</integer>
-	<dimen name="rounded_corner_radius">70px</dimen>
-	<dimen name="status_bar_height_portrait">60px</dimen>
-	<dimen name="status_bar_height_landscape">24.0dip</dimen>
-	<string translatable="false" name="config_mainBuiltInDisplayCutout">
-   	M -50,0 L -50,55 L 50,55 L 50,0 Z
-   	</string>
+    <bool name="config_showNavigationBar">true</bool>
+    <bool name="config_automatic_brightness_available">true</bool>
+    <bool name="config_setColorTransformAccelerated">true</bool>
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+    <bool name="skip_restoring_network_selection">true</bool>
+    <bool name="config_bluetooth_le_peripheral_mode_supported">true</bool>
+    <bool name="config_carrier_volte_available">true</bool>
+    <bool name="config_device_volte_available">true</bool>
+    <bool name="config_device_vt_available">true</bool>
+    <bool name="config_device_wfc_ims_available">true</bool>
+    <bool name="config_hotswapCapable">true</bool>
+    <bool name="config_lidControlsSleep">true</bool>
+    <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
+    <bool name="config_wifi_background_scan_support">true</bool>
+    <bool name="config_wifi_batched_scan_supported">true</bool>
+    <bool name="config_wifi_dual_band_support">false</bool>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <bool name="config_dozePulsePickup">true</bool>
+    <bool name="config_displayBlanksAfterDoze">true</bool>
+    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
+    <bool name="config_supportDoubleTapWake">true</bool>
+    <bool name="config_supportSystemNavigationKeys">false</bool>
+    <bool name="config_enableBurnInProtection">true</bool>
+    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
+    <fraction name="config_autoBrightnessAdjustmentMaxGamma">100.0%</fraction>
+    <fraction name="config_maximumScreenDimRatio">30%</fraction>
+    <fraction name="config_screenAutoBrightnessDozeScaleFactor">100.0%</fraction>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
+    <integer name="config_autoBrightnessDarkeningLightDebounce">1000</integer>
+    <integer name="config_screenBrightnessDark">1</integer>
+    <integer name="config_screenBrightnessDim">13</integer>
+    <integer name="config_screenBrightnessDoze">17</integer>
+    <integer name="config_screenBrightnessSettingDefault">536</integer>
+    <integer name="config_screenBrightnessSettingMaximum">2047</integer>
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+    <integer name="config_bluetooth_idle_cur_ma">0</integer>
+    <integer name="config_bluetooth_operating_voltage_mv">3300</integer>
+    <integer name="config_bluetooth_rx_cur_ma">0</integer>
+    <integer name="config_bluetooth_tx_cur_ma">0</integer>
+    <integer name="config_shutdownBatteryTemperature">600</integer>
+    <integer name="config_autoBrightnessInitialLightSensorRate">-1</integer>
+    <integer name="config_autoBrightnessLightSensorRate">250</integer>
+    <integer name="config_screenBrightnessForVrSettingDefault">86</integer>
+    <integer name="config_screenBrightnessForVrSettingMaximum">255</integer>
+    <integer name="config_screenBrightnessForVrSettingMinimum">79</integer>
+    <dimen name="rounded_corner_radius">70px</dimen>
+    <dimen name="status_bar_height">60px</dimen>
+    <dimen name="status_bar_height_portrait">60px</dimen>
+    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <string translatable="false" name="config_mainBuiltInDisplayCutout">M -50,0 L -50,55 L 50,55 L 50,0 Z</string>
 </resources>
diff --git a/Xiaomi/Redmi8A/res/values/config.xml b/Xiaomi/Redmi8A/res/values/config.xml
index 926c92a..9b85f84 100644
--- a/Xiaomi/Redmi8A/res/values/config.xml
+++ b/Xiaomi/Redmi8A/res/values/config.xml
@@ -89,6 +89,7 @@
     <integer name="config_bluetooth_rx_cur_ma">0</integer>
     <integer name="config_bluetooth_tx_cur_ma">0</integer>
     <integer name="config_shutdownBatteryTemperature">630</integer>
+    <dimen name="status_bar_height">60px</dimen>
     <dimen name="status_bar_height_portrait">60px</dimen>
     <dimen name="rounded_corner_radius">70px</dimen>
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
diff --git a/Xiaomi/Redmi9A/res/values/config.xml b/Xiaomi/Redmi9A/res/values/config.xml
index 6d5c1fa..ac6275b 100644
--- a/Xiaomi/Redmi9A/res/values/config.xml
+++ b/Xiaomi/Redmi9A/res/values/config.xml
@@ -290,6 +290,7 @@
     <integer name="config_bluetooth_rx_cur_ma">0</integer>
     <integer name="config_bluetooth_tx_cur_ma">0</integer>
     <integer name="config_shutdownBatteryTemperature">600</integer>
+    <dimen name="status_bar_height">24.0dip</dimen>
     <dimen name="status_bar_height_portrait">24.0dip</dimen>
     <dimen name="rounded_corner_radius">0.0dip</dimen>
 </resources>
diff --git a/Xiaomi/RedmiK20Pro-SystemUI/res/values/config.xml b/Xiaomi/RedmiK20Pro-SystemUI/res/values/config.xml
index f107ccd..af5df80 100755
--- a/Xiaomi/RedmiK20Pro-SystemUI/res/values/config.xml
+++ b/Xiaomi/RedmiK20Pro-SystemUI/res/values/config.xml
@@ -3,7 +3,7 @@
     <dimen name="status_bar_padding_start">45px</dimen>
     <dimen name="status_bar_padding_end">45px</dimen>
     <dimen name="status_bar_header_height_keyguard">35dp</dimen>
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-    <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>
+    <dimen name="keyguard_carrier_text_margin">45px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">45px</dimen>
     <dimen name="rounded_corner_content_padding">4dp</dimen>
 </resources>
diff --git a/Xiaomi/RedmiK20Pro/res/values-land/config.xml b/Xiaomi/RedmiK20Pro/res/values-land/config.xml
index 9d6de4c..80d82e4 100755
--- a/Xiaomi/RedmiK20Pro/res/values-land/config.xml
+++ b/Xiaomi/RedmiK20Pro/res/values-land/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
+    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">28dp</dimen>
 </resources>
diff --git a/Xiaomi/RedmiK20Pro/res/values/config.xml b/Xiaomi/RedmiK20Pro/res/values/config.xml
index c7a2ab3..5f0a452 100755
--- a/Xiaomi/RedmiK20Pro/res/values/config.xml
+++ b/Xiaomi/RedmiK20Pro/res/values/config.xml
@@ -8,9 +8,10 @@
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
     <bool name="config_enableBurnInProtection">true</bool>
 
+    <dimen name="status_bar_height">35dp</dimen>
     <dimen name="status_bar_height_portrait">35dp</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">@dimen/status_bar_height_portrait</dimen>
+    <dimen name="quick_qs_offset_height">35dp</dimen>
 
     <integer name="config_screenBrightnessDoze">5</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
diff --git a/Xiaomi/RedmiNote10Pro/res/values/config.xml b/Xiaomi/RedmiNote10Pro/res/values/config.xml
index 90d0787..8d1ad70 100644
--- a/Xiaomi/RedmiNote10Pro/res/values/config.xml
+++ b/Xiaomi/RedmiNote10Pro/res/values/config.xml
@@ -9,6 +9,7 @@
     <!-- dimens.xml files -->
     <dimen name="rounded_corner_radius_bottom">102px</dimen>
     <dimen name="rounded_corner_radius_top">102px</dimen>
+    <dimen name="status_bar_height">93px</dimen>
     <dimen name="status_bar_height_portrait">93px</dimen>
 
     <!-- arrays.xml files -->
diff --git a/Xiaomi/RedmiNote10S/res/values/config.xml b/Xiaomi/RedmiNote10S/res/values/config.xml
index 19a06b8..e6ab4fc 100644
--- a/Xiaomi/RedmiNote10S/res/values/config.xml
+++ b/Xiaomi/RedmiNote10S/res/values/config.xml
@@ -9,6 +9,7 @@
     <!-- dimens.xml files -->
     <dimen name="rounded_corner_radius_bottom">102px</dimen>
     <dimen name="rounded_corner_radius_top">102px</dimen>
+    <dimen name="status_bar_height">93px</dimen>
     <dimen name="status_bar_height_portrait">93px</dimen>
 
     <!-- arrays.xml files -->
diff --git a/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml b/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote6Pro/res/values/notch.xml b/Xiaomi/RedmiNote6Pro/res/values/notch.xml
index a144bb8..d1ee338 100644
--- a/Xiaomi/RedmiNote6Pro/res/values/notch.xml
+++ b/Xiaomi/RedmiNote6Pro/res/values/notch.xml
@@ -17,6 +17,8 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar in landscape -->
diff --git a/Xiaomi/RedmiNote7/res/values-land/notch.xml b/Xiaomi/RedmiNote7/res/values-land/notch.xml
new file mode 100644
index 0000000..54d279d
--- /dev/null
+++ b/Xiaomi/RedmiNote7/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24.0dip</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote7/res/values/notch.xml b/Xiaomi/RedmiNote7/res/values/notch.xml
index 106be1a..d556d57 100644
--- a/Xiaomi/RedmiNote7/res/values/notch.xml
+++ b/Xiaomi/RedmiNote7/res/values/notch.xml
@@ -17,9 +17,11 @@
 */
 -->
 <resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">89px</dimen>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">89px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24.0dip</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -176,0 L -176,89 L 176,89 L 176,0 Z</string>
-    </resources>
+</resources>
diff --git a/Xiaomi/RedmiNote8Pro/res/values/notch.xml b/Xiaomi/RedmiNote8Pro/res/values/notch.xml
index c561feb..d2ee601 100644
--- a/Xiaomi/RedmiNote8Pro/res/values/notch.xml
+++ b/Xiaomi/RedmiNote8Pro/res/values/notch.xml
@@ -19,7 +19,8 @@
 <resources>
     <dimen name="rounded_corner_radius_top">95.0px</dimen>
     <dimen name="rounded_corner_radius_bottom">90.0px</dimen>
-    <dimen name="status_bar_height_portrait">27.629974dip</dimen>    
+    <dimen name="status_bar_height">27.629974dip</dimen>
+    <dimen name="status_bar_height_portrait">27.629974dip</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M84.0014003,76.0002722 C39.8036856,75.9997279 11.8039716,75.9996372 0.00225823708,76 C-11.8004588,76.0003629 -39.8012115,76.0004536 -84,76.0002722 L-84,-4.19220214e-13 L84.0014003,-4.19220214e-13 L84.0014003,76.0002722 Z</string>
-    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>    
+    <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
 </resources>
diff --git a/Xiaomi/RedmiNote9Pro/res/values-land/notch.xml b/Xiaomi/RedmiNote9Pro/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/RedmiNote9Pro/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote9Pro/res/values/notch.xml b/Xiaomi/RedmiNote9Pro/res/values/notch.xml
index f340677..b8a82d2 100644
--- a/Xiaomi/RedmiNote9Pro/res/values/notch.xml
+++ b/Xiaomi/RedmiNote9Pro/res/values/notch.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="status_bar_height">100px</dimen>
     <dimen name="status_bar_height_portrait">100px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="rounded_corner_radius_top">93px</dimen>
diff --git a/Xiaomi/RedmiNote9ProMax/res/values-land/notch.xml b/Xiaomi/RedmiNote9ProMax/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/RedmiNote9ProMax/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote9ProMax/res/values/notch.xml b/Xiaomi/RedmiNote9ProMax/res/values/notch.xml
index f340677..b8a82d2 100644
--- a/Xiaomi/RedmiNote9ProMax/res/values/notch.xml
+++ b/Xiaomi/RedmiNote9ProMax/res/values/notch.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="status_bar_height">100px</dimen>
     <dimen name="status_bar_height_portrait">100px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="rounded_corner_radius_top">93px</dimen>
diff --git a/Xiaomi/RedmiNote9S/res/values-land/notch.xml b/Xiaomi/RedmiNote9S/res/values-land/notch.xml
new file mode 100644
index 0000000..2aca2b3
--- /dev/null
+++ b/Xiaomi/RedmiNote9S/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote9S/res/values/notch.xml b/Xiaomi/RedmiNote9S/res/values/notch.xml
index f340677..b8a82d2 100644
--- a/Xiaomi/RedmiNote9S/res/values/notch.xml
+++ b/Xiaomi/RedmiNote9S/res/values/notch.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="status_bar_height">100px</dimen>
     <dimen name="status_bar_height_portrait">100px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="rounded_corner_radius_top">93px</dimen>
diff --git a/Xiaomi/RedmiNote9T/res/values/config.xml b/Xiaomi/RedmiNote9T/res/values/config.xml
index 181bd5d..d199e72 100755
--- a/Xiaomi/RedmiNote9T/res/values/config.xml
+++ b/Xiaomi/RedmiNote9T/res/values/config.xml
@@ -34,6 +34,7 @@
     <bool name="config_supportDoubleTapWake">false</bool>
     <bool name="config_dynamic_bind_ims">true</bool>
     <bool name="config_powerDecoupleInteractiveModeFromDisplay">false</bool>
+    <dimen name="status_bar_height">24dp</dimen>
     <dimen name="status_bar_height_portrait">24dp</dimen>
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>
     <fraction name="config_maximumScreenDimRatio">29.999996%</fraction>
diff --git a/tests/blacklist b/tests/blacklist
index 6cd332d..a8e7cc5 100644
--- a/tests/blacklist
+++ b/tests/blacklist
@@ -11,5 +11,4 @@ config_multiuserMaximumUsers
 config_screen_magnification_multi_tap_adjustment
 config_swipe_up_gesture_default
 config_allowAllRotations
-status_bar_height
 config_volumeAdjustmentForRemoteGroupSessions