diff --git a/device.mk b/device.mk
index 6fab78c..f266e14 100644
--- a/device.mk
+++ b/device.mk
@@ -35,8 +35,10 @@ PRODUCT_ENFORCE_RRO_TARGETS := *
PRODUCT_PACKAGES += \
CarrierConfigResCommon \
FrameworksResTarget \
- OPlusFrameworksResCommon \
- OPlusSettingsResCommon \
+ OPlusFrameworksResTarget \
+ OPlusSettingsProviderResTarget \
+ OPlusSettingsResTarget \
+ OPlusSystemUIResTarget \
WifiResTarget
# AAPT
diff --git a/overlay/OPlusFrameworksResCommon/res/values/config.xml b/overlay/OPlusFrameworksResCommon/res/values/config.xml
deleted file mode 100644
index dd99336..0000000
--- a/overlay/OPlusFrameworksResCommon/res/values/config.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- true
-
-
- 0
-
-
- 90
-
-
-
- - 0
- - 80
-
-
-
-
- - 0
- - 80
-
-
-
-
- - 80
-
-
-
-
- - 0:2:15
-
-
-
- true
-
-
-
- - @array/config_sfps_sensor_props_0
-
-
-
- - local:4630946945666696833
- - 1080
- - 815
- - 115
-
-
-
-
- - "/system/framework/framework.jar"
- - "/system/framework/services.jar"
- - "/apex/com.android.art/javalib/core-oj.jar"
- - "/apex/com.android.art/javalib/core-libart.jar"
- - "/system_ext/priv-app/SystemUI/SystemUI.apk"
- - "/system/bin/surfaceflinger"
- - "/vendor/lib64/libcamxexternalformatutils.so"
- - "/vendor/lib64/libipebpsstriping.so"
- - "/vendor/lib64/libCB.so"
- - "/vendor/lib64/libgsl.so"
-
-
-
- false
-
-
- true
-
-
- true
-
-
-
- - gsm,11
- - utran,11
- - cdma1x,1
- - hrpd,3
- - ehrpd,12
- - eutran,11
- - nfc,1
-
-
-
- 18
-
-
- -1650
-
-
diff --git a/overlay/OPlusFrameworksResCommon/Android.bp b/overlay/OPlusFrameworksResTarget/Android.bp
similarity index 79%
rename from overlay/OPlusFrameworksResCommon/Android.bp
rename to overlay/OPlusFrameworksResTarget/Android.bp
index 832aa30..23cfce2 100644
--- a/overlay/OPlusFrameworksResCommon/Android.bp
+++ b/overlay/OPlusFrameworksResTarget/Android.bp
@@ -4,6 +4,6 @@
//
runtime_resource_overlay {
- name: "OPlusFrameworksResCommon",
+ name: "OPlusFrameworksResTarget",
device_specific: true,
}
diff --git a/overlay/OPlusFrameworksResCommon/AndroidManifest.xml b/overlay/OPlusFrameworksResTarget/AndroidManifest.xml
similarity index 100%
rename from overlay/OPlusFrameworksResCommon/AndroidManifest.xml
rename to overlay/OPlusFrameworksResTarget/AndroidManifest.xml
diff --git a/overlay/OPlusFrameworksResCommon/res/values-mcc310-mnc590/config.xml b/overlay/OPlusFrameworksResTarget/res/values-mcc310-mnc590/config.xml
similarity index 100%
rename from overlay/OPlusFrameworksResCommon/res/values-mcc310-mnc590/config.xml
rename to overlay/OPlusFrameworksResTarget/res/values-mcc310-mnc590/config.xml
diff --git a/overlay/OPlusFrameworksResCommon/res/values-mcc310-mnc890/config.xml b/overlay/OPlusFrameworksResTarget/res/values-mcc310-mnc890/config.xml
similarity index 100%
rename from overlay/OPlusFrameworksResCommon/res/values-mcc310-mnc890/config.xml
rename to overlay/OPlusFrameworksResTarget/res/values-mcc310-mnc890/config.xml
diff --git a/overlay/OPlusFrameworksResCommon/res/values-mcc311-mnc270/config.xml b/overlay/OPlusFrameworksResTarget/res/values-mcc311-mnc270/config.xml
similarity index 100%
rename from overlay/OPlusFrameworksResCommon/res/values-mcc311-mnc270/config.xml
rename to overlay/OPlusFrameworksResTarget/res/values-mcc311-mnc270/config.xml
diff --git a/overlay/OPlusFrameworksResCommon/res/values-mcc311-mnc480/config.xml b/overlay/OPlusFrameworksResTarget/res/values-mcc311-mnc480/config.xml
similarity index 100%
rename from overlay/OPlusFrameworksResCommon/res/values-mcc311-mnc480/config.xml
rename to overlay/OPlusFrameworksResTarget/res/values-mcc311-mnc480/config.xml
diff --git a/overlay/OPlusFrameworksResCommon/res/values-mcc312-mnc770/config.xml b/overlay/OPlusFrameworksResTarget/res/values-mcc312-mnc770/config.xml
similarity index 100%
rename from overlay/OPlusFrameworksResCommon/res/values-mcc312-mnc770/config.xml
rename to overlay/OPlusFrameworksResTarget/res/values-mcc312-mnc770/config.xml
diff --git a/overlay/OPlusFrameworksResTarget/res/values/config.xml b/overlay/OPlusFrameworksResTarget/res/values/config.xml
new file mode 100644
index 0000000..804a76d
--- /dev/null
+++ b/overlay/OPlusFrameworksResTarget/res/values/config.xml
@@ -0,0 +1,521 @@
+
+
+
+
+
+ true
+
+
+
+ - 600
+ - 300
+
+
+
+
+ - 600
+ - 300
+
+
+
+
+ - 10
+
+
+
+
+ - 0
+
+
+
+
+ - 0
+
+
+
+
+ - 1
+ - 4
+ - 12
+ - 20
+ - 28
+ - 47
+ - 63
+ - 86
+ - 150
+ - 160
+ - 220
+ - 270
+ - 360
+ - 420
+ - 510
+ - 620
+ - 1000
+ - 2000
+ - 3100
+ - 5000
+ - 8000
+ - 12000
+ - 16000
+ - 20000
+
+
+
+
+ - 0.8487
+ - 3.0394
+ - 15.2619
+ - 30.2619
+ - 46.671
+ - 65.95
+ - 80.46
+ - 84.38
+ - 89.51
+ - 100.34
+ - 102.21
+ - 109.48
+ - 114.19
+ - 123.86
+ - 129.18
+ - 138.07
+ - 145.62
+ - 168.84
+ - 234.9
+ - 280
+ - 320
+ - 360
+ - 405
+ - 450
+ - 500
+
+
+
+
+ - 0.0307
+ - 7.037
+ - 15.379
+ - 23.5493
+ - 31.7799
+ - 39.8811
+ - 48.2243
+ - 56.2296
+ - 64.2022
+ - 71.9943
+ - 80.5941
+ - 88.7333
+ - 96.9831
+ - 105.0798
+ - 113.1635
+ - 121.1973
+ - 129.2246
+ - 137.3341
+ - 145.32
+ - 153.267
+ - 161.1661
+ - 169.0299
+ - 177.0172
+ - 184.8931
+ - 192.6803
+ - 200.4254
+ - 208.2067
+ - 216.0382
+ - 223.7154
+ - 231.3969
+ - 239.0252
+ - 244.7239
+ - 252.3076
+ - 260.0522
+ - 267.6324
+ - 275.1667
+ - 282.6581
+ - 290.3193
+ - 297.9373
+ - 305.571
+ - 313.0667
+ - 320.6049
+ - 328.6051
+ - 335.7412
+ - 343.1922
+ - 350.6566
+ - 358.1323
+ - 365.529
+ - 373.0114
+ - 380.4509
+ - 387.8658
+ - 395.3285
+ - 402.6951
+ - 410.0712
+ - 417.4442
+ - 424.8042
+ - 432.0771
+ - 439.3496
+ - 446.6545
+ - 454.0463
+ - 461.4097
+ - 468.5552
+ - 473.9042
+ - 482.879
+ - 490.2271
+
+
+
+
+ - @null
+ - 4
+ - 8
+ - 12
+ - 16
+ - 20
+ - 24
+ - 28
+ - 32
+ - 36
+ - 40
+ - 44
+ - 48
+ - 52
+ - 56
+ - 60
+ - 64
+ - 68
+ - 72
+ - 76
+ - 80
+ - 84
+ - 88
+ - 92
+ - 96
+ - 100
+ - 104
+ - 108
+ - 112
+ - 116
+ - 120
+ - 123
+ - 127
+ - 131
+ - 135
+ - 139
+ - 143
+ - 147
+ - 151
+ - 155
+ - 159
+ - 163
+ - 167
+ - 171
+ - 175
+ - 179
+ - 183
+ - 187
+ - 191
+ - 195
+ - 199
+ - 203
+ - 207
+ - 211
+ - 215
+ - 219
+ - 223
+ - 227
+ - 231
+ - 235
+ - 239
+ - 243
+ - 246
+ - 251
+ - 255
+
+
+
+ 6
+
+
+ - 0.45882353
+
+
+ - 1.0
+
+
+ - 0.001954079
+
+
+ 1500
+ 1500
+
+
+ 200
+
+
+
+ M 99,68.5
+ M 65,68.5
+ A 34,34 0 1,0 133,68.5
+ A 34,34 0 1,0 65,68.5
+ Z
+ @left
+
+
+
+
+ M 0,0
+ H 164
+ V 127
+ H 0
+ Z
+ @left
+
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ 0
+
+
+ 90
+
+
+
+ - 0
+ - 80
+
+
+
+
+ - 0
+ - 80
+
+
+
+
+ - 80
+
+
+
+ true
+
+
+
+ - @array/config_sfps_sensor_props_0
+
+
+
+ - local:4630946945666696833
+ - 1080
+ - 815
+ - 115
+
+
+
+
+ - "/system/framework/framework.jar"
+ - "/system/framework/services.jar"
+ - "/apex/com.android.art/javalib/core-oj.jar"
+ - "/apex/com.android.art/javalib/core-libart.jar"
+ - "/system_ext/priv-app/SystemUI/SystemUI.apk"
+ - "/system/bin/surfaceflinger"
+ - "/vendor/lib64/libcamxexternalformatutils.so"
+ - "/vendor/lib64/libipebpsstriping.so"
+ - "/vendor/lib64/libCB.so"
+ - "/vendor/lib64/libgsl.so"
+
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+
+ - gsm,11
+ - utran,11
+ - cdma1x,1
+ - hrpd,3
+ - ehrpd,12
+ - eutran,11
+ - nfc,1
+
+
+
+ 18
+
+
+ -1650
+
+
diff --git a/overlay/OPlusFrameworksResTarget/res/values/dimens.xml b/overlay/OPlusFrameworksResTarget/res/values/dimens.xml
new file mode 100644
index 0000000..cbc464a
--- /dev/null
+++ b/overlay/OPlusFrameworksResTarget/res/values/dimens.xml
@@ -0,0 +1,28 @@
+
+
+
+
+ 127px
+
+
+ 20dp
+
diff --git a/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
new file mode 100644
index 0000000..0b430c7
--- /dev/null
+++ b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
@@ -0,0 +1,110 @@
+
+
+ - 0
+ - 35
+ - 100
+ - 330
+ - 25.6
+ - 1.7
+ - 1.8
+ - 115
+ - 70
+ - 0
+ - 0
+ - 90
+ - 532
+ - 75
+ - 16
+ - 41
+ - 1.7
+ - 76
+ - 176
+ - 3300
+ - 191.5
+ - 143.5
+
+ 1
+
+ - 1
+ - 200.8
+
+ 176.4
+ 246.8
+ 323.3
+ 484.6
+ 646.8
+
+ - 800
+
+
+ 4
+ 2
+
+
+ 300000
+ 576000
+ 710400
+ 940800
+ 1190400
+ 1324800
+ 1478400
+ 1574400
+ 1708800
+ 1804800
+
+
+ 768000
+ 979200
+ 1017600
+ 1248000
+ 1401600
+ 1536000
+ 1651200
+ 1804800
+ 2035200
+
+
+ 30
+ 32
+ 34
+ 40
+ 47
+ 56
+ 60
+ 62
+ 67
+ 72
+
+
+ 62
+ 79
+ 87
+ 100
+ 114
+ 136
+ 151
+ 180
+ 234
+
+ - 15.68
+ - 6.5
+
+ 22.7
+
+ - 5000
+ - 1.4
+ - 177
+ - 269
+
+ - 3300
+
+ .0002
+ .002
+ .02
+ .2
+ 2
+
+
+
+
+
diff --git a/overlay/OPlusSettingsProviderResTarget/Android.bp b/overlay/OPlusSettingsProviderResTarget/Android.bp
new file mode 100644
index 0000000..73617c8
--- /dev/null
+++ b/overlay/OPlusSettingsProviderResTarget/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+ name: "OPlusSettingsProviderResTarget",
+ device_specific: true,
+}
diff --git a/overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml b/overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml
new file mode 100644
index 0000000..b1b461e
--- /dev/null
+++ b/overlay/OPlusSettingsProviderResTarget/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml b/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml
new file mode 100644
index 0000000..433faf6
--- /dev/null
+++ b/overlay/OPlusSettingsProviderResTarget/res/values/defaults.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+ OnePlus Nord N200
+
+
diff --git a/overlay/OPlusSettingsResCommon/Android.bp b/overlay/OPlusSettingsResTarget/Android.bp
similarity index 80%
rename from overlay/OPlusSettingsResCommon/Android.bp
rename to overlay/OPlusSettingsResTarget/Android.bp
index f7823df..4ae65c5 100644
--- a/overlay/OPlusSettingsResCommon/Android.bp
+++ b/overlay/OPlusSettingsResTarget/Android.bp
@@ -4,6 +4,6 @@
//
runtime_resource_overlay {
- name: "OPlusSettingsResCommon",
+ name: "OPlusSettingsResTarget",
device_specific: true,
}
diff --git a/overlay/OPlusSettingsResCommon/AndroidManifest.xml b/overlay/OPlusSettingsResTarget/AndroidManifest.xml
similarity index 100%
rename from overlay/OPlusSettingsResCommon/AndroidManifest.xml
rename to overlay/OPlusSettingsResTarget/AndroidManifest.xml
diff --git a/overlay/OPlusSettingsResCommon/res/values/config.xml b/overlay/OPlusSettingsResTarget/res/values/config.xml
similarity index 100%
rename from overlay/OPlusSettingsResCommon/res/values/config.xml
rename to overlay/OPlusSettingsResTarget/res/values/config.xml
diff --git a/overlay/OPlusSystemUIResTarget/Android.bp b/overlay/OPlusSystemUIResTarget/Android.bp
new file mode 100644
index 0000000..0b502e3
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+ name: "OPlusSystemUIResTarget",
+ device_specific: true,
+}
diff --git a/overlay/OPlusSystemUIResTarget/AndroidManifest.xml b/overlay/OPlusSystemUIResTarget/AndroidManifest.xml
new file mode 100644
index 0000000..4de1645
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_bottom.xml b/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_bottom.xml
new file mode 100644
index 0000000..90c793d
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_bottom.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_top.xml b/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_top.xml
new file mode 100644
index 0000000..aed278a
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/res/drawable/rounded_corner_top.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml b/overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml
new file mode 100644
index 0000000..eb52f89
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/res/values-land/dimens.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ 48px
+
+
+ 65px
+
+
+ 0px
+
diff --git a/overlay/OPlusSystemUIResTarget/res/values/config.xml b/overlay/OPlusSystemUIResTarget/res/values/config.xml
new file mode 100644
index 0000000..a3af732
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/res/values/config.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ true
+
diff --git a/overlay/OPlusSystemUIResTarget/res/values/dimens.xml b/overlay/OPlusSystemUIResTarget/res/values/dimens.xml
new file mode 100644
index 0000000..f9dbb90
--- /dev/null
+++ b/overlay/OPlusSystemUIResTarget/res/values/dimens.xml
@@ -0,0 +1,58 @@
+
+
+
+
+ 97px
+
+
+ 0px
+
+
+ 28px
+
+
+ 11px
+
+
+ @*android:dimen/status_bar_height
+
+
+ @dimen/status_bar_padding_start
+
+
+ @dimen/status_bar_padding_end
+
+ 300px
+
+
+ 1080px
+
+
+ 930px
+
+
+ 930px
+