From 09824e8d7bc302cdfe1f1da1192fd50d6428501b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 2 Sep 2022 15:20:52 +0800
Subject: [PATCH] Fixup resources for OnePlus Nord CE

---
 .../{NORDCE-SystemUI => NordCE-SystemUI}/Android.mk  |  0
 .../AndroidManifest.xml                              |  2 +-
 .../res/values-land/config.xml                       |  0
 .../res/values/config.xml                            |  2 +-
 OnePlus/{NORDCE => NordCE}/Android.mk                |  0
 OnePlus/{NORDCE => NordCE}/AndroidManifest.xml       |  2 +-
 .../{NORDCE => NordCE}/res/values-land/config.xml    |  0
 OnePlus/{NORDCE => NordCE}/res/values/config.xml     | 12 ++++++------
 OnePlus/{NORDCE => NordCE}/res/xml/power_profile.xml |  0
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename OnePlus/{NORDCE-SystemUI => NordCE-SystemUI}/Android.mk (100%)
 rename OnePlus/{NORDCE-SystemUI => NordCE-SystemUI}/AndroidManifest.xml (94%)
 rename OnePlus/{NORDCE-SystemUI => NordCE-SystemUI}/res/values-land/config.xml (100%)
 rename OnePlus/{NORDCE-SystemUI => NordCE-SystemUI}/res/values/config.xml (82%)
 rename OnePlus/{NORDCE => NordCE}/Android.mk (100%)
 rename OnePlus/{NORDCE => NordCE}/AndroidManifest.xml (91%)
 rename OnePlus/{NORDCE => NordCE}/res/values-land/config.xml (100%)
 rename OnePlus/{NORDCE => NordCE}/res/values/config.xml (89%)
 rename OnePlus/{NORDCE => NordCE}/res/xml/power_profile.xml (100%)

diff --git a/OnePlus/NORDCE-SystemUI/Android.mk b/OnePlus/NordCE-SystemUI/Android.mk
similarity index 100%
rename from OnePlus/NORDCE-SystemUI/Android.mk
rename to OnePlus/NordCE-SystemUI/Android.mk
diff --git a/OnePlus/NORDCE-SystemUI/AndroidManifest.xml b/OnePlus/NordCE-SystemUI/AndroidManifest.xml
similarity index 94%
rename from OnePlus/NORDCE-SystemUI/AndroidManifest.xml
rename to OnePlus/NordCE-SystemUI/AndroidManifest.xml
index 5d82707..3de4257 100644
--- a/OnePlus/NORDCE-SystemUI/AndroidManifest.xml
+++ b/OnePlus/NordCE-SystemUI/AndroidManifest.xml
@@ -5,6 +5,6 @@
         <overlay android:targetPackage="com.android.systemui"
                 android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
                 android:requiredSystemPropertyValue="+OnePlus/OnePlusNordCE*"
-		android:priority="111"
+		android:priority="2091"
 		android:isStatic="true" />
 </manifest>
diff --git a/OnePlus/NORDCE-SystemUI/res/values-land/config.xml b/OnePlus/NordCE-SystemUI/res/values-land/config.xml
similarity index 100%
rename from OnePlus/NORDCE-SystemUI/res/values-land/config.xml
rename to OnePlus/NordCE-SystemUI/res/values-land/config.xml
diff --git a/OnePlus/NORDCE-SystemUI/res/values/config.xml b/OnePlus/NordCE-SystemUI/res/values/config.xml
similarity index 82%
rename from OnePlus/NORDCE-SystemUI/res/values/config.xml
rename to OnePlus/NordCE-SystemUI/res/values/config.xml
index ded4666..b3c4f5c 100644
--- a/OnePlus/NORDCE-SystemUI/res/values/config.xml
+++ b/OnePlus/NordCE-SystemUI/res/values/config.xml
@@ -2,7 +2,7 @@
 <resources>
     <dimen name="status_bar_padding_start">25px</dimen>
     <dimen name="status_bar_padding_end">50px</dimen>
-    <dimen name="status_bar_header_height_keyguard">133px</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">50px</dimen>
 </resources>
diff --git a/OnePlus/NORDCE/Android.mk b/OnePlus/NordCE/Android.mk
similarity index 100%
rename from OnePlus/NORDCE/Android.mk
rename to OnePlus/NordCE/Android.mk
diff --git a/OnePlus/NORDCE/AndroidManifest.xml b/OnePlus/NordCE/AndroidManifest.xml
similarity index 91%
rename from OnePlus/NORDCE/AndroidManifest.xml
rename to OnePlus/NordCE/AndroidManifest.xml
index c491589..c005cfb 100644
--- a/OnePlus/NORDCE/AndroidManifest.xml
+++ b/OnePlus/NordCE/AndroidManifest.xml
@@ -5,6 +5,6 @@
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
                 android:requiredSystemPropertyValue="+OnePlus/OnePlusNordCE*"
-                android:priority="111"
+                android:priority="2091"
 		android:isStatic="true" />
 </manifest>
diff --git a/OnePlus/NORDCE/res/values-land/config.xml b/OnePlus/NordCE/res/values-land/config.xml
similarity index 100%
rename from OnePlus/NORDCE/res/values-land/config.xml
rename to OnePlus/NordCE/res/values-land/config.xml
diff --git a/OnePlus/NORDCE/res/values/config.xml b/OnePlus/NordCE/res/values/config.xml
similarity index 89%
rename from OnePlus/NORDCE/res/values/config.xml
rename to OnePlus/NordCE/res/values/config.xml
index 61f91a9..b5e8e17 100644
--- a/OnePlus/NORDCE/res/values/config.xml
+++ b/OnePlus/NordCE/res/values/config.xml
@@ -5,11 +5,11 @@
     <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
     <bool name="config_automatic_brightness_available">true</bool>
 
-    <dimen name="status_bar_height_default">133px</dimen>
-    <dimen name="status_bar_height">133px</dimen>
-    <dimen name="status_bar_height_portrait">133px</dimen>
+    <dimen name="status_bar_height_default">139px</dimen>
+    <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">133px</dimen>
+    <dimen name="quick_qs_offset_height">139px</dimen>
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
@@ -201,6 +201,6 @@
         <item>255</item>
     </integer-array>
 
-    <string name="config_mainBuiltInDisplayCutout">M 0,0 L -28, 0 L -24.3940446283, 16.0595537175 C -23.5582133885, 24.4178661152 -19.6, 90.0 -11.2, 90.0 L 11.2, 90.0 C 19.6, 90.0 23.5582133885, 24.4178661152 24.3940446283, 16.0595537175 L 28, 0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M 0,0 L -28, 0 L -24.3940446283, 16.0595537175 C -23.5582133885, 24.4178661152 -19.6, 90.0 -11.2, 90.0 L 11.2, 90.0 C 19.6, 90.0 23.5582133885, 24.4178661152 24.3940446283, 16.0595537175 L 28, 0 Z</string>
+    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,100 L -401,100 L -401,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,100 L -401,100 L -401,0 Z</string>
 </resources>
diff --git a/OnePlus/NORDCE/res/xml/power_profile.xml b/OnePlus/NordCE/res/xml/power_profile.xml
similarity index 100%
rename from OnePlus/NORDCE/res/xml/power_profile.xml
rename to OnePlus/NordCE/res/xml/power_profile.xml