From d519ac9aa85fa2db393c7fa3171020d2e21219a2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 22 Feb 2022 14:26:54 +0800
Subject: [PATCH] Rescope Reno3 Pro overlay to devices of the same "Reno Pro
 2019" ID

Now targeting all CN variants (i.e. BL publicly unlockable) of Reno3 Pro, Reno4 Pro, Reno5 Pro/+, Reno6 Pro/+

Change-Id: I90c65f8001ff278d143b143a27e59f75d56875aa
---
 OPPO/{Reno3Pro-SystemUI => RenoPro2019-SystemUI}/Android.mk   | 2 +-
 .../AndroidManifest.xml                                       | 4 ++--
 .../res/values-land/config.xml                                | 0
 .../res/values/config.xml                                     | 0
 OPPO/{Reno3Pro => RenoPro2019}/Android.mk                     | 2 +-
 OPPO/{Reno3Pro => RenoPro2019}/AndroidManifest.xml            | 4 ++--
 OPPO/{Reno3Pro => RenoPro2019}/res/values-land/config.xml     | 0
 OPPO/{Reno3Pro => RenoPro2019}/res/values/config.xml          | 4 ++--
 overlay.mk                                                    | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename OPPO/{Reno3Pro-SystemUI => RenoPro2019-SystemUI}/Android.mk (78%)
 rename OPPO/{Reno3Pro-SystemUI => RenoPro2019-SystemUI}/AndroidManifest.xml (64%)
 rename OPPO/{Reno3Pro-SystemUI => RenoPro2019-SystemUI}/res/values-land/config.xml (100%)
 rename OPPO/{Reno3Pro-SystemUI => RenoPro2019-SystemUI}/res/values/config.xml (100%)
 rename OPPO/{Reno3Pro => RenoPro2019}/Android.mk (81%)
 rename OPPO/{Reno3Pro => RenoPro2019}/AndroidManifest.xml (64%)
 rename OPPO/{Reno3Pro => RenoPro2019}/res/values-land/config.xml (100%)
 rename OPPO/{Reno3Pro => RenoPro2019}/res/values/config.xml (87%)

diff --git a/OPPO/Reno3Pro-SystemUI/Android.mk b/OPPO/RenoPro2019-SystemUI/Android.mk
similarity index 78%
rename from OPPO/Reno3Pro-SystemUI/Android.mk
rename to OPPO/RenoPro2019-SystemUI/Android.mk
index 4e2116b..096328e 100644
--- a/OPPO/Reno3Pro-SystemUI/Android.mk
+++ b/OPPO/RenoPro2019-SystemUI/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-oppo-reno3pro-systemui
+LOCAL_PACKAGE_NAME := treble-overlay-oppo-renopro2019-systemui
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/OPPO/Reno3Pro-SystemUI/AndroidManifest.xml b/OPPO/RenoPro2019-SystemUI/AndroidManifest.xml
similarity index 64%
rename from OPPO/Reno3Pro-SystemUI/AndroidManifest.xml
rename to OPPO/RenoPro2019-SystemUI/AndroidManifest.xml
index 5f68e9c..b3b7367 100644
--- a/OPPO/Reno3Pro-SystemUI/AndroidManifest.xml
+++ b/OPPO/RenoPro2019-SystemUI/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.oppo.reno3pro.systemui"
+        package="me.phh.treble.overlay.oppo.renopro2019.systemui"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="com.android.systemui"
                 android:requiredSystemPropertyName="ro.boot.prjname"
-                android:requiredSystemPropertyValue="+(19101|19335|19501)"
+                android:requiredSystemPropertyValue="+(19101|19102|19191|19192|20131|20133|20135|20139|20161|20163|20171)"
         android:priority="1910"
         android:isStatic="true" />
 </manifest>
diff --git a/OPPO/Reno3Pro-SystemUI/res/values-land/config.xml b/OPPO/RenoPro2019-SystemUI/res/values-land/config.xml
similarity index 100%
rename from OPPO/Reno3Pro-SystemUI/res/values-land/config.xml
rename to OPPO/RenoPro2019-SystemUI/res/values-land/config.xml
diff --git a/OPPO/Reno3Pro-SystemUI/res/values/config.xml b/OPPO/RenoPro2019-SystemUI/res/values/config.xml
similarity index 100%
rename from OPPO/Reno3Pro-SystemUI/res/values/config.xml
rename to OPPO/RenoPro2019-SystemUI/res/values/config.xml
diff --git a/OPPO/Reno3Pro/Android.mk b/OPPO/RenoPro2019/Android.mk
similarity index 81%
rename from OPPO/Reno3Pro/Android.mk
rename to OPPO/RenoPro2019/Android.mk
index 14baea5..2e3108e 100644
--- a/OPPO/Reno3Pro/Android.mk
+++ b/OPPO/RenoPro2019/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-oppo-reno3pro
+LOCAL_PACKAGE_NAME := treble-overlay-oppo-renopro2019
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/OPPO/Reno3Pro/AndroidManifest.xml b/OPPO/RenoPro2019/AndroidManifest.xml
similarity index 64%
rename from OPPO/Reno3Pro/AndroidManifest.xml
rename to OPPO/RenoPro2019/AndroidManifest.xml
index 41daa9e..8742fe2 100644
--- a/OPPO/Reno3Pro/AndroidManifest.xml
+++ b/OPPO/RenoPro2019/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.oppo.reno3pro"
+        package="me.phh.treble.overlay.oppo.renopro2019"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.boot.prjname"
-                android:requiredSystemPropertyValue="+(19101|19335|19501)"
+                android:requiredSystemPropertyValue="+(19101|19102|19191|19192|20131|20133|20135|20139|20161|20163|20171)"
         android:priority="1910"
         android:isStatic="true" />
 </manifest>
diff --git a/OPPO/Reno3Pro/res/values-land/config.xml b/OPPO/RenoPro2019/res/values-land/config.xml
similarity index 100%
rename from OPPO/Reno3Pro/res/values-land/config.xml
rename to OPPO/RenoPro2019/res/values-land/config.xml
diff --git a/OPPO/Reno3Pro/res/values/config.xml b/OPPO/RenoPro2019/res/values/config.xml
similarity index 87%
rename from OPPO/Reno3Pro/res/values/config.xml
rename to OPPO/RenoPro2019/res/values/config.xml
index d2bec5c..3993970 100644
--- a/OPPO/Reno3Pro/res/values/config.xml
+++ b/OPPO/RenoPro2019/res/values/config.xml
@@ -10,6 +10,6 @@
 
     <integer name="config_screenBrightnessSettingMinimum">1</integer>
 
-    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,100 L -409,100 L -409,0 Z</string>
-    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,100 L -409,100 L -409,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,102 L -408,102 L -408,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,102 L -408,102 L -408,0 Z</string>
 </resources>
diff --git a/overlay.mk b/overlay.mk
index 8e29677..698c545 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -111,8 +111,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-oppo-a54-systemui \
 	treble-overlay-oppo-peqm00 \
 	treble-overlay-oppo-peqm00-systemui \
-	treble-overlay-oppo-reno3pro \
-	treble-overlay-oppo-reno3pro-systemui \
+	treble-overlay-oppo-renopro2019 \
+	treble-overlay-oppo-renopro2019-systemui \
 	treble-overlay-oukitel-wp8pro \
 	treble-overlay-razer-cheryl \
 	treble-overlay-realme-6 \