From 52dc74af6fad09291f6098928907c1a22293f7a3 Mon Sep 17 00:00:00 2001
From: TechnoStone <sanik0109@mail.ru>
Date: Fri, 10 Apr 2020 18:46:56 +0300
Subject: [PATCH] Renamed Nokia phones to codenames and models

---
 Nokia/{b2n => B2N-7Plus}/Android.mk           |   2 +-
 Nokia/{b2n => B2N-7Plus}/AndroidManifest.xml  |   2 +-
 .../{b2n => B2N-7Plus}/res/values/config.xml  |   0
 .../res/xml/power_profile.xml                 |   0
 Nokia/{PL2 => CTL-7.1}/Android.mk             |   2 +-
 Nokia/{ctl => CTL-7.1}/AndroidManifest.xml    |   2 +-
 Nokia/{ctl => CTL-7.1}/res/values/config.xml  |   0
 .../res/xml/power_profile.xml                 |   0
 Nokia/DRG-6.1Plus-X6/Android.mk               |   8 ++
 .../AndroidManifest.xml                       |   2 +-
 .../res/values/config.xml                     |   0
 .../res/xml/power_profile.xml                 |   0
 Nokia/{ctl => PL2-6.1}/Android.mk             |   2 +-
 Nokia/{PL2 => PL2-6.1}/AndroidManifest.xml    |   2 +-
 .../res/values/brightness.xml                 |   0
 Nokia/{PL2 => PL2-6.1}/res/values/doze.xml    |   0
 Nokia/{PL2 => PL2-6.1}/res/values/misc.xml    |   0
 Nokia/{PL2 => PL2-6.1}/res/values/network.xml |   0
 Nokia/{PL2 => PL2-6.1}/res/values/sensors.xml |   0
 Nokia/PNX-8.1-X7-SystemUI/Android.mk          |   6 +
 Nokia/PNX-8.1-X7-SystemUI/AndroidManifest.xml |   7 +
 .../res/values-sw372dp/config.xml             |  28 ++++
 .../PNX-8.1-X7-SystemUI/res/values/config.xml |  28 ++++
 Nokia/{drg => PNX-8.1-X7}/Android.mk          |   2 +-
 Nokia/PNX-8.1-X7/AndroidManifest.xml          |  10 ++
 Nokia/PNX-8.1-X7/res/values/config.xml        | 122 ++++++++++++++++++
 Nokia/PNX-8.1-X7/res/xml/power_profile.xml    | 100 ++++++++++++++
 overlay.mk                                    |  10 +-
 28 files changed, 323 insertions(+), 12 deletions(-)
 rename Nokia/{b2n => B2N-7Plus}/Android.mk (81%)
 rename Nokia/{b2n => B2N-7Plus}/AndroidManifest.xml (87%)
 rename Nokia/{b2n => B2N-7Plus}/res/values/config.xml (100%)
 rename Nokia/{b2n => B2N-7Plus}/res/xml/power_profile.xml (100%)
 rename Nokia/{PL2 => CTL-7.1}/Android.mk (81%)
 rename Nokia/{ctl => CTL-7.1}/AndroidManifest.xml (88%)
 rename Nokia/{ctl => CTL-7.1}/res/values/config.xml (100%)
 rename Nokia/{ctl => CTL-7.1}/res/xml/power_profile.xml (100%)
 create mode 100644 Nokia/DRG-6.1Plus-X6/Android.mk
 rename Nokia/{drg => DRG-6.1Plus-X6}/AndroidManifest.xml (86%)
 rename Nokia/{drg => DRG-6.1Plus-X6}/res/values/config.xml (100%)
 rename Nokia/{drg => DRG-6.1Plus-X6}/res/xml/power_profile.xml (100%)
 rename Nokia/{ctl => PL2-6.1}/Android.mk (81%)
 mode change 100644 => 100755
 rename Nokia/{PL2 => PL2-6.1}/AndroidManifest.xml (88%)
 mode change 100644 => 100755
 rename Nokia/{PL2 => PL2-6.1}/res/values/brightness.xml (100%)
 mode change 100644 => 100755
 rename Nokia/{PL2 => PL2-6.1}/res/values/doze.xml (100%)
 mode change 100644 => 100755
 rename Nokia/{PL2 => PL2-6.1}/res/values/misc.xml (100%)
 mode change 100644 => 100755
 rename Nokia/{PL2 => PL2-6.1}/res/values/network.xml (100%)
 mode change 100644 => 100755
 rename Nokia/{PL2 => PL2-6.1}/res/values/sensors.xml (100%)
 mode change 100644 => 100755
 create mode 100644 Nokia/PNX-8.1-X7-SystemUI/Android.mk
 create mode 100644 Nokia/PNX-8.1-X7-SystemUI/AndroidManifest.xml
 create mode 100644 Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml
 create mode 100644 Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml
 rename Nokia/{drg => PNX-8.1-X7}/Android.mk (80%)
 create mode 100644 Nokia/PNX-8.1-X7/AndroidManifest.xml
 create mode 100644 Nokia/PNX-8.1-X7/res/values/config.xml
 create mode 100644 Nokia/PNX-8.1-X7/res/xml/power_profile.xml

diff --git a/Nokia/b2n/Android.mk b/Nokia/B2N-7Plus/Android.mk
similarity index 81%
rename from Nokia/b2n/Android.mk
rename to Nokia/B2N-7Plus/Android.mk
index 668916f..195ce14 100644
--- a/Nokia/b2n/Android.mk
+++ b/Nokia/B2N-7Plus/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-nokia-b2n
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-b2n-7plus
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Nokia/b2n/AndroidManifest.xml b/Nokia/B2N-7Plus/AndroidManifest.xml
similarity index 87%
rename from Nokia/b2n/AndroidManifest.xml
rename to Nokia/B2N-7Plus/AndroidManifest.xml
index b7e9566..0c999cf 100644
--- a/Nokia/b2n/AndroidManifest.xml
+++ b/Nokia/B2N-7Plus/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.nokia.b2n"
+        package="me.phh.treble.overlay.nokia.b2n_7plus"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/Nokia/b2n/res/values/config.xml b/Nokia/B2N-7Plus/res/values/config.xml
similarity index 100%
rename from Nokia/b2n/res/values/config.xml
rename to Nokia/B2N-7Plus/res/values/config.xml
diff --git a/Nokia/b2n/res/xml/power_profile.xml b/Nokia/B2N-7Plus/res/xml/power_profile.xml
similarity index 100%
rename from Nokia/b2n/res/xml/power_profile.xml
rename to Nokia/B2N-7Plus/res/xml/power_profile.xml
diff --git a/Nokia/PL2/Android.mk b/Nokia/CTL-7.1/Android.mk
similarity index 81%
rename from Nokia/PL2/Android.mk
rename to Nokia/CTL-7.1/Android.mk
index 8940968..a25feb3 100644
--- a/Nokia/PL2/Android.mk
+++ b/Nokia/CTL-7.1/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-nokia-PL2
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-ctl-7-1
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Nokia/ctl/AndroidManifest.xml b/Nokia/CTL-7.1/AndroidManifest.xml
similarity index 88%
rename from Nokia/ctl/AndroidManifest.xml
rename to Nokia/CTL-7.1/AndroidManifest.xml
index 9e31bcb..2198b5a 100644
--- a/Nokia/ctl/AndroidManifest.xml
+++ b/Nokia/CTL-7.1/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.nokia.ctl"
+        package="me.phh.treble.overlay.nokia.ctl_7_1"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/Nokia/ctl/res/values/config.xml b/Nokia/CTL-7.1/res/values/config.xml
similarity index 100%
rename from Nokia/ctl/res/values/config.xml
rename to Nokia/CTL-7.1/res/values/config.xml
diff --git a/Nokia/ctl/res/xml/power_profile.xml b/Nokia/CTL-7.1/res/xml/power_profile.xml
similarity index 100%
rename from Nokia/ctl/res/xml/power_profile.xml
rename to Nokia/CTL-7.1/res/xml/power_profile.xml
diff --git a/Nokia/DRG-6.1Plus-X6/Android.mk b/Nokia/DRG-6.1Plus-X6/Android.mk
new file mode 100644
index 0000000..0bdaa81
--- /dev/null
+++ b/Nokia/DRG-6.1Plus-X6/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-drg-6.1plus-x6
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Nokia/drg/AndroidManifest.xml b/Nokia/DRG-6.1Plus-X6/AndroidManifest.xml
similarity index 86%
rename from Nokia/drg/AndroidManifest.xml
rename to Nokia/DRG-6.1Plus-X6/AndroidManifest.xml
index 72231da..00aadd5 100644
--- a/Nokia/drg/AndroidManifest.xml
+++ b/Nokia/DRG-6.1Plus-X6/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.nokia.drg"
+        package="me.phh.treble.overlay.nokia.drg_6_1plus_x6"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/Nokia/drg/res/values/config.xml b/Nokia/DRG-6.1Plus-X6/res/values/config.xml
similarity index 100%
rename from Nokia/drg/res/values/config.xml
rename to Nokia/DRG-6.1Plus-X6/res/values/config.xml
diff --git a/Nokia/drg/res/xml/power_profile.xml b/Nokia/DRG-6.1Plus-X6/res/xml/power_profile.xml
similarity index 100%
rename from Nokia/drg/res/xml/power_profile.xml
rename to Nokia/DRG-6.1Plus-X6/res/xml/power_profile.xml
diff --git a/Nokia/ctl/Android.mk b/Nokia/PL2-6.1/Android.mk
old mode 100644
new mode 100755
similarity index 81%
rename from Nokia/ctl/Android.mk
rename to Nokia/PL2-6.1/Android.mk
index 686fa2c..aa60fba
--- a/Nokia/ctl/Android.mk
+++ b/Nokia/PL2-6.1/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-nokia-ctl
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-pl2-6.1
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Nokia/PL2/AndroidManifest.xml b/Nokia/PL2-6.1/AndroidManifest.xml
old mode 100644
new mode 100755
similarity index 88%
rename from Nokia/PL2/AndroidManifest.xml
rename to Nokia/PL2-6.1/AndroidManifest.xml
index 534b139..5fb73c3
--- a/Nokia/PL2/AndroidManifest.xml
+++ b/Nokia/PL2-6.1/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.nokia.PL2"
+        package="me.phh.treble.overlay.nokia.pl2_6_1"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/Nokia/PL2/res/values/brightness.xml b/Nokia/PL2-6.1/res/values/brightness.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Nokia/PL2/res/values/brightness.xml
rename to Nokia/PL2-6.1/res/values/brightness.xml
diff --git a/Nokia/PL2/res/values/doze.xml b/Nokia/PL2-6.1/res/values/doze.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Nokia/PL2/res/values/doze.xml
rename to Nokia/PL2-6.1/res/values/doze.xml
diff --git a/Nokia/PL2/res/values/misc.xml b/Nokia/PL2-6.1/res/values/misc.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Nokia/PL2/res/values/misc.xml
rename to Nokia/PL2-6.1/res/values/misc.xml
diff --git a/Nokia/PL2/res/values/network.xml b/Nokia/PL2-6.1/res/values/network.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Nokia/PL2/res/values/network.xml
rename to Nokia/PL2-6.1/res/values/network.xml
diff --git a/Nokia/PL2/res/values/sensors.xml b/Nokia/PL2-6.1/res/values/sensors.xml
old mode 100644
new mode 100755
similarity index 100%
rename from Nokia/PL2/res/values/sensors.xml
rename to Nokia/PL2-6.1/res/values/sensors.xml
diff --git a/Nokia/PNX-8.1-X7-SystemUI/Android.mk b/Nokia/PNX-8.1-X7-SystemUI/Android.mk
new file mode 100644
index 0000000..8689b05
--- /dev/null
+++ b/Nokia/PNX-8.1-X7-SystemUI/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-pnx-8.1-x7-systemui
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Nokia/PNX-8.1-X7-SystemUI/AndroidManifest.xml b/Nokia/PNX-8.1-X7-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..5c4db4d
--- /dev/null
+++ b/Nokia/PNX-8.1-X7-SystemUI/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.nokia.pnx_8_1_x7.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+	android:priority="164" />
+</manifest>
diff --git a/Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml b/Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml
new file mode 100644
index 0000000..42a128e
--- /dev/null
+++ b/Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2006, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+<dimen name="rounded_corner_content_padding">24.0px</dimen>
+<dimen name="status_bar_padding_start">32.0px</dimen>
+<dimen name="status_bar_padding_end">24.0px</dimen>
+<dimen name="display_cutout_margin_consumption">50.0px</dimen>
+<dimen name="status_bar_clock_size">37.0px</dimen>
+<dimen name="qs_time_collapsed_size">37.0px</dimen>
+<dimen name="qs_time_expanded_size">37.0px</dimen>
+<dimen name="rounded_corner_radius_top">110.0px</dimen>
+<dimen name="rounded_corner_radius_bottom">110.0px</dimen>
+</resources>
diff --git a/Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml b/Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml
new file mode 100644
index 0000000..42a128e
--- /dev/null
+++ b/Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2006, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+<dimen name="rounded_corner_content_padding">24.0px</dimen>
+<dimen name="status_bar_padding_start">32.0px</dimen>
+<dimen name="status_bar_padding_end">24.0px</dimen>
+<dimen name="display_cutout_margin_consumption">50.0px</dimen>
+<dimen name="status_bar_clock_size">37.0px</dimen>
+<dimen name="qs_time_collapsed_size">37.0px</dimen>
+<dimen name="qs_time_expanded_size">37.0px</dimen>
+<dimen name="rounded_corner_radius_top">110.0px</dimen>
+<dimen name="rounded_corner_radius_bottom">110.0px</dimen>
+</resources>
diff --git a/Nokia/drg/Android.mk b/Nokia/PNX-8.1-X7/Android.mk
similarity index 80%
rename from Nokia/drg/Android.mk
rename to Nokia/PNX-8.1-X7/Android.mk
index 994aae0..e55aae1 100644
--- a/Nokia/drg/Android.mk
+++ b/Nokia/PNX-8.1-X7/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-nokia-drg
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-pnx-8.1-x7
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Nokia/PNX-8.1-X7/AndroidManifest.xml b/Nokia/PNX-8.1-X7/AndroidManifest.xml
new file mode 100644
index 0000000..0345834
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.nokia.pnx_8_1_x7"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+Nokia/Phoenix*"
+				android:priority="20"
+				android:isStatic="true" />
+</manifest>
diff --git a/Nokia/PNX-8.1-X7/res/values/config.xml b/Nokia/PNX-8.1-X7/res/values/config.xml
new file mode 100644
index 0000000..e8d6699
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/res/values/config.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_supportDoubleTapWake">true</bool>
+    <bool name="config_dozePulsePickup">true</bool>
+	<bool name="config_automatic_brightness_available">true</bool>
+
+    <dimen name="status_bar_height">86px</dimen>
+    <dimen name="status_bar_height_portrait">86px</dimen>
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+    <dimen name="rounded_corner_radius_top">110.0px</dimen>
+    <dimen name="rounded_corner_radius_bottom">110.0px</dimen>
+    <dimen name="notification_header_padding_top">10.0dip</dimen>
+    <dimen name="notification_header_padding_bottom">11.0dip</dimen>
+
+    <integer name="config_bluetooth_idle_cur_ma">1</integer>
+    <integer name="config_bluetooth_operating_voltage_mv">3300</integer>
+    <integer name="config_bluetooth_rx_cur_ma">2</integer>
+    <integer name="config_bluetooth_tx_cur_ma">3</integer>
+    <integer name="config_screenBrightnessDark">1</integer>
+    <integer name="config_screenBrightnessDim">2</integer>
+    <integer name="config_screenBrightnessDoze">17</integer>
+    <integer name="config_screenBrightnessSettingDefault">128</integer>
+    <integer name="config_screenBrightnessSettingMaximum">255</integer>
+    <integer name="config_shutdownBatteryTemperature">600</integer>
+    <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>
+        <item>45</item>
+        <item>100</item>
+        <item>140</item>
+        <item>170</item>
+        <item>190</item>
+        <item>200</item>
+        <item>302</item>
+        <item>345</item>
+        <item>588</item>
+    </integer-array>
+    <integer-array name="config_screenBrightnessBacklight">
+        <item>0</item>
+        <item>1</item>
+        <item>10</item>
+        <item>15</item>
+        <item>30</item>
+        <item>45</item>
+        <item>60</item>
+        <item>75</item>
+        <item>90</item>
+        <item>105</item>
+        <item>120</item>
+        <item>135</item>
+        <item>150</item>
+        <item>165</item>
+        <item>180</item>
+        <item>195</item>
+        <item>210</item>
+        <item>225</item>
+        <item>240</item>
+        <item>255</item>
+    </integer-array>
+    <integer-array name="config_screenBrightnessNits">
+        <item>0</item>
+        <item>4</item>
+        <item>23</item>
+        <item>35</item>
+        <item>71</item>
+        <item>103</item>
+        <item>143</item>
+        <item>175</item>
+        <item>202</item>
+        <item>233</item>
+        <item>275</item>
+        <item>311</item>
+        <item>346</item>
+        <item>382</item>
+        <item>414</item>
+        <item>452</item>
+        <item>487</item>
+        <item>522</item>
+        <item>556</item>
+        <item>588</item>
+    </integer-array>
+    <integer-array name="config_autoBrightnessLevels">
+        <item>4</item>
+        <item>23</item>
+        <item>112</item>
+        <item>300</item>
+        <item>500</item>
+        <item>700</item>
+        <item>950</item>
+        <item>3050</item>
+        <item>7000</item>
+        <item>10000</item>
+    </integer-array>
+    <string-array name="networkAttributes">
+        <item>wifi,1,1,1,-1,true</item>
+        <item>mobile,0,0,0,-1,true</item>
+        <item>mobile_mms,2,0,4,60000,true</item>
+        <item>mobile_supl,3,0,2,60000,true</item>
+        <item>mobile_dun,4,0,2,60000,true</item>
+        <item>mobile_hipri,5,0,3,60000,true</item>
+        <item>mobile_fota,10,0,2,60000,true</item>
+        <item>mobile_ims,11,0,2,60000,true</item>
+        <item>mobile_cbs,12,0,2,60000,true</item>
+        <item>wifi_p2p,13,1,0,-1,true</item>
+        <item>ethernet,9,9,9,-1,true</item>
+        <item>bluetooth,7,7,2,-1,true</item>
+        <item>mobile_emergency,15,0,5,-1,true</item>
+    </string-array>
+    <string-array name="radioAttributes">
+        <item>1,1</item>
+        <item>0,1</item>
+        <item>9,1</item>
+    </string-array>
+
+    <!-- notch configuration in oem xml, works well -->
+    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
+    <string translatable="false" name="config_mainBuiltInDisplayCutout">M315,0c-16.7,0-31.6,10.4-37.3,26.1l-8.5,23.3C261.5,72.4,240.4,86,217.1,86H-217.1 c-23.3,0-44.7-14.7-52.2-36.6l-8.5-23.3C-283.4,10.4,-298.3,0,-315,0H315z</string>
+</resources>
diff --git a/Nokia/PNX-8.1-X7/res/xml/power_profile.xml b/Nokia/PNX-8.1-X7/res/xml/power_profile.xml
new file mode 100644
index 0000000..96e4c26
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/res/xml/power_profile.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="none">0</item>
+    <item name="screen.on">127.2</item>
+    <item name="screen.full">296.6</item>
+    <item name="bluetooth.active">13.65</item>
+    <item name="bluetooth.on">0.47</item>
+    <item name="wifi.on">0.28</item>
+    <item name="wifi.active">171.9</item>
+    <item name="wifi.scan">43.43</item>
+    <item name="dsp.audio">11.79</item>
+    <item name="dsp.video">75.35</item>
+    <item name="camera.flashlight">288</item>
+    <item name="camera.avg">550</item>
+    <item name="gps.on">50</item>
+    <item name="radio.active">134.8</item>
+    <item name="radio.scanning">10</item>
+    <array name="radio.on">
+        <value>2</value>
+        <value>1</value>
+    </array>
+    <item name="modem.controller.idle">0</item>
+    <item name="modem.controller.rx">0</item>
+    <item name="modem.controller.tx">0</item>
+    <item name="modem.controller.voltage">0</item>
+    <array name="cpu.clusters.cores">
+        <value>6</value>
+        <value>2</value>
+    </array>
+    <array name="cpu.speeds.cluster0">
+        <value>300000</value>
+        <value>576000</value>
+        <value>748800</value>
+        <value>998400</value>
+        <value>1209600</value>
+        <value>1324800</value>
+        <value>1516800</value>
+        <value>1612800</value>
+        <value>1708800</value>
+    </array>
+    <array name="cpu.active.cluster0">
+        <value>35.5</value>
+        <value>40.0</value>
+        <value>42.5</value>
+        <value>48.7</value>
+        <value>54.1</value>
+        <value>57.5</value>
+        <value>64.2</value>
+        <value>68.4</value>
+        <value>73.7</value>
+    </array>
+    <array name="cpu.speeds.cluster1">
+        <value>300000</value>
+        <value>652800</value>
+        <value>825600</value>
+        <value>979200</value>
+        <value>1132800</value>
+        <value>1363200</value>
+        <value>1536000</value>
+        <value>1747200</value>
+        <value>1843200</value>
+        <value>1996800</value>
+        <value>2054400</value>
+        <value>2169600</value>
+        <value>2208000</value>
+    </array>
+    <array name="cpu.active.cluster1">
+        <value>44.2</value>
+        <value>60.7</value>
+        <value>69.4</value>
+        <value>80.6</value>
+        <value>92.8</value>
+        <value>117.7</value>
+        <value>136.1</value>
+        <value>161.2</value>
+        <value>194.3</value>
+        <value>224.5</value>
+        <value>248.6</value>
+        <value>285.3</value>
+        <value>293.6</value>
+    </array>
+    <item name="cpu.idle">4</item>
+    <item name="cpu.awake">17</item>
+    <item name="battery.capacity">3500</item>
+    <item name="wifi.controller.idle">0</item>
+    <item name="wifi.controller.rx">0</item>
+    <item name="wifi.controller.tx">0</item>
+    <item name="bluetooth.controller.idle">0</item>
+    <item name="bluetooth.controller.rx">0</item>
+    <item name="bluetooth.controller.tx">0</item>
+    <array name="wifi.controller.tx_levels" />
+    <item name="wifi.controller.voltage">0</item>
+    <array name="wifi.batchedscan">
+        <value>.0002</value>
+        <value>.002</value>
+        <value>.02</value>
+        <value>.2</value>
+        <value>2</value>
+    </array>
+</device>
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index ac8beb1..541416b 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -46,10 +46,12 @@ PRODUCT_PACKAGES += \
 	treble-overlay-moto-g6plus \
 	treble-overlay-moto-g7play \
 	treble-overlay-moto-g7power \
-	treble-overlay-nokia-PL2 \
-	treble-overlay-nokia-b2n \
-	treble-overlay-nokia-ctl \
-	treble-overlay-nokia-drg \
+	treble-overlay-nokia-b2n-7plus \
+	treble-overlay-nokia-ctl-7.1 \
+	treble-overlay-nokia-drg-6.1plus-x6 \
+	treble-overlay-nokia-pl2-6.1 \
+	treble-overlay-nokia-pnx-8.1-x7 \
+	treble-overlay-nokia-pnx-8.1-x7-systemui \
 	treble-overlay-nubia-z18mini \
 	treble-overlay-oneplus-op6 \
 	treble-overlay-oneplus-op6t \