From af3fb798e8689addcba5b3487bf39f77db2d3db2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 15 Mar 2023 12:15:24 +0000
Subject: [PATCH] Fixup multi-resolution resources for some devices

Apparently now you just have to define the cutout once in the highest resolution available
Also re-measured Meizu 18 and Samsung Galaxy Quantum2 dimens

Change-Id: I7b8802612d5633b4e12b714f5dd33ae9016e5bd4
---
 Meizu/M2181-SystemUI/res/values-xxhdpi/config.xml  |  2 +-
 Meizu/M2181-SystemUI/res/values-xxxhdpi/config.xml |  2 +-
 Meizu/M2181/res/values-xxhdpi/config.xml           | 11 ++++-------
 Meizu/M2181/res/values-xxxhdpi/config.xml          | 11 ++++-------
 Meizu/M2181/res/values/config.xml                  |  3 +++
 OPPO/FindX3Pro/res/values-xxhdpi/config.xml        |  3 ---
 OPPO/FindX3Pro/res/values-xxxhdpi/config.xml       |  3 ---
 OPPO/FindX3Pro/res/values/config.xml               |  3 +++
 OnePlus/OP10Pro/res/values-xxhdpi/config.xml       |  3 ---
 OnePlus/OP10Pro/res/values-xxxhdpi/config.xml      |  3 ---
 OnePlus/OP10Pro/res/values/config.xml              |  3 +++
 Realme/GT2Pro/res/values-xxhdpi/config.xml         |  3 ---
 Realme/GT2Pro/res/values-xxxhdpi/config.xml        |  3 ---
 Realme/GT2Pro/res/values/config.xml                |  3 +++
 Samsung/a82xq/res/values-xhdpi/config.xml          |  3 ---
 Samsung/a82xq/res/values-xxhdpi/config.xml         |  3 ---
 Samsung/a82xq/res/values-xxxhdpi/config.xml        |  3 ---
 Samsung/a82xq/res/values/config.xml                |  3 +++
 18 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/Meizu/M2181-SystemUI/res/values-xxhdpi/config.xml b/Meizu/M2181-SystemUI/res/values-xxhdpi/config.xml
index 4d11da4..2a7c3c1 100644
--- a/Meizu/M2181-SystemUI/res/values-xxhdpi/config.xml
+++ b/Meizu/M2181-SystemUI/res/values-xxhdpi/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">96px</dimen>
+    <dimen name="status_bar_header_height_keyguard">95px</dimen>
     <dimen name="keyguard_carrier_text_margin">50px</dimen>
     <dimen name="system_icons_keyguard_padding_end">50px</dimen>
 </resources>
diff --git a/Meizu/M2181-SystemUI/res/values-xxxhdpi/config.xml b/Meizu/M2181-SystemUI/res/values-xxxhdpi/config.xml
index aa67362..2fdc3d8 100644
--- a/Meizu/M2181-SystemUI/res/values-xxxhdpi/config.xml
+++ b/Meizu/M2181-SystemUI/res/values-xxxhdpi/config.xml
@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">66px</dimen>
     <dimen name="status_bar_padding_end">66px</dimen>
-    <dimen name="status_bar_header_height_keyguard">128px</dimen>
+    <dimen name="status_bar_header_height_keyguard">126px</dimen>
     <dimen name="keyguard_carrier_text_margin">66px</dimen>
     <dimen name="system_icons_keyguard_padding_end">66px</dimen>
 </resources>
diff --git a/Meizu/M2181/res/values-xxhdpi/config.xml b/Meizu/M2181/res/values-xxhdpi/config.xml
index a791453..e656e0c 100644
--- a/Meizu/M2181/res/values-xxhdpi/config.xml
+++ b/Meizu/M2181/res/values-xxhdpi/config.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="status_bar_height_default">96px</dimen>
-    <dimen name="status_bar_height">96px</dimen>
-    <dimen name="status_bar_height_portrait">96px</dimen>
+    <dimen name="status_bar_height_default">95px</dimen>
+    <dimen name="status_bar_height">95px</dimen>
+    <dimen name="status_bar_height_portrait">95px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">96px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -48,0 L -48,96 L 48,96 L 48,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -48,0 L -48,96 L 48,96 L 48,0 Z</string>
+    <dimen name="quick_qs_offset_height">95px</dimen>
 </resources>
diff --git a/Meizu/M2181/res/values-xxxhdpi/config.xml b/Meizu/M2181/res/values-xxxhdpi/config.xml
index d5c6f7d..228b313 100644
--- a/Meizu/M2181/res/values-xxxhdpi/config.xml
+++ b/Meizu/M2181/res/values-xxxhdpi/config.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="status_bar_height_default">128px</dimen>
-    <dimen name="status_bar_height">128px</dimen>
-    <dimen name="status_bar_height_portrait">128px</dimen>
+    <dimen name="status_bar_height_default">126px</dimen>
+    <dimen name="status_bar_height">126px</dimen>
+    <dimen name="status_bar_height_portrait">126px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
-    <dimen name="quick_qs_offset_height">128px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -64,0 L -64,128 L 64,128 L 64,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -64,0 L -64,128 L 64,128 L 64,0 Z</string>
+    <dimen name="quick_qs_offset_height">126px</dimen>
 </resources>
diff --git a/Meizu/M2181/res/values/config.xml b/Meizu/M2181/res/values/config.xml
index ed8320f..152c067 100644
--- a/Meizu/M2181/res/values/config.xml
+++ b/Meizu/M2181/res/values/config.xml
@@ -9,4 +9,7 @@
 
     <integer name="config_screenBrightnessDoze">5</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <string name="config_mainBuiltInDisplayCutout">M -43,0 L -43,104 L 43,104 L 43,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -43,0 L -43,104 L 43,104 L 43,0 Z</string>
 </resources>
diff --git a/OPPO/FindX3Pro/res/values-xxhdpi/config.xml b/OPPO/FindX3Pro/res/values-xxhdpi/config.xml
index a75d755..145f5c6 100644
--- a/OPPO/FindX3Pro/res/values-xxhdpi/config.xml
+++ b/OPPO/FindX3Pro/res/values-xxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">120px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">120px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,93 L -394,93 L -394,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,93 L -394,93 L -394,0 Z</string>
 </resources>
diff --git a/OPPO/FindX3Pro/res/values-xxxhdpi/config.xml b/OPPO/FindX3Pro/res/values-xxxhdpi/config.xml
index adb9987..80d2755 100644
--- a/OPPO/FindX3Pro/res/values-xxxhdpi/config.xml
+++ b/OPPO/FindX3Pro/res/values-xxxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">160px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">160px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
 </resources>
diff --git a/OPPO/FindX3Pro/res/values/config.xml b/OPPO/FindX3Pro/res/values/config.xml
index d450afa..f1c56ed 100644
--- a/OPPO/FindX3Pro/res/values/config.xml
+++ b/OPPO/FindX3Pro/res/values/config.xml
@@ -10,4 +10,7 @@
 
     <integer name="config_screenBrightnessDoze">3</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <string name="config_mainBuiltInDisplayCutout">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
 </resources>
diff --git a/OnePlus/OP10Pro/res/values-xxhdpi/config.xml b/OnePlus/OP10Pro/res/values-xxhdpi/config.xml
index a75d755..145f5c6 100644
--- a/OnePlus/OP10Pro/res/values-xxhdpi/config.xml
+++ b/OnePlus/OP10Pro/res/values-xxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">120px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">120px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,93 L -394,93 L -394,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,93 L -394,93 L -394,0 Z</string>
 </resources>
diff --git a/OnePlus/OP10Pro/res/values-xxxhdpi/config.xml b/OnePlus/OP10Pro/res/values-xxxhdpi/config.xml
index adb9987..80d2755 100644
--- a/OnePlus/OP10Pro/res/values-xxxhdpi/config.xml
+++ b/OnePlus/OP10Pro/res/values-xxxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">160px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">160px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
 </resources>
diff --git a/OnePlus/OP10Pro/res/values/config.xml b/OnePlus/OP10Pro/res/values/config.xml
index d450afa..f1c56ed 100644
--- a/OnePlus/OP10Pro/res/values/config.xml
+++ b/OnePlus/OP10Pro/res/values/config.xml
@@ -10,4 +10,7 @@
 
     <integer name="config_screenBrightnessDoze">3</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <string name="config_mainBuiltInDisplayCutout">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
 </resources>
diff --git a/Realme/GT2Pro/res/values-xxhdpi/config.xml b/Realme/GT2Pro/res/values-xxhdpi/config.xml
index a75d755..145f5c6 100644
--- a/Realme/GT2Pro/res/values-xxhdpi/config.xml
+++ b/Realme/GT2Pro/res/values-xxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">120px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">120px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,93 L -394,93 L -394,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,93 L -394,93 L -394,0 Z</string>
 </resources>
diff --git a/Realme/GT2Pro/res/values-xxxhdpi/config.xml b/Realme/GT2Pro/res/values-xxxhdpi/config.xml
index adb9987..80d2755 100644
--- a/Realme/GT2Pro/res/values-xxxhdpi/config.xml
+++ b/Realme/GT2Pro/res/values-xxxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">160px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">160px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
 </resources>
diff --git a/Realme/GT2Pro/res/values/config.xml b/Realme/GT2Pro/res/values/config.xml
index d450afa..f1c56ed 100644
--- a/Realme/GT2Pro/res/values/config.xml
+++ b/Realme/GT2Pro/res/values/config.xml
@@ -10,4 +10,7 @@
 
     <integer name="config_screenBrightnessDoze">3</integer>
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <string name="config_mainBuiltInDisplayCutout">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -720,0 L -720,124 L -525,124 L -525,0 Z</string>
 </resources>
diff --git a/Samsung/a82xq/res/values-xhdpi/config.xml b/Samsung/a82xq/res/values-xhdpi/config.xml
index be5584a..86cadf0 100644
--- a/Samsung/a82xq/res/values-xhdpi/config.xml
+++ b/Samsung/a82xq/res/values-xhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">60px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">60px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -19,0 L -19,60 L 19,60 L 19,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -19,0 L -19,60 L 19,60 L 19,0 Z</string>
 </resources>
diff --git a/Samsung/a82xq/res/values-xxhdpi/config.xml b/Samsung/a82xq/res/values-xxhdpi/config.xml
index ea66451..7e98f31 100644
--- a/Samsung/a82xq/res/values-xxhdpi/config.xml
+++ b/Samsung/a82xq/res/values-xxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">90px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">90px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -29,0 L -29,90 L 29,90 L 29,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -29,0 L -29,90 L 29,90 L 29,0 Z</string>
 </resources>
diff --git a/Samsung/a82xq/res/values-xxxhdpi/config.xml b/Samsung/a82xq/res/values-xxxhdpi/config.xml
index 5e2a3ac..145f5c6 100644
--- a/Samsung/a82xq/res/values-xxxhdpi/config.xml
+++ b/Samsung/a82xq/res/values-xxxhdpi/config.xml
@@ -5,7 +5,4 @@
     <dimen name="status_bar_height_portrait">120px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="quick_qs_offset_height">120px</dimen>
-
-    <string name="config_mainBuiltInDisplayCutout">M -39,0 L -39,120 L 39,120 L 39,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -39,0 L -39,120 L 39,120 L 39,0 Z</string>
 </resources>
diff --git a/Samsung/a82xq/res/values/config.xml b/Samsung/a82xq/res/values/config.xml
index fa888bc..2fc9311 100644
--- a/Samsung/a82xq/res/values/config.xml
+++ b/Samsung/a82xq/res/values/config.xml
@@ -619,4 +619,7 @@
         <item>471</item>
         <item>486</item>
     </integer-array>
+
+    <string name="config_mainBuiltInDisplayCutout">M -38,0 L -38,98 L 38,98 L 38,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -38,0 L -38,98 L 38,98 L 38,0 Z</string>
 </resources>