Merge pull request phhusson#472 from AndyCGYan/rescope-renopro

Collection of changes

OPPO/A54-SystemUI/AndroidManifest.xml

@@ -4,7 +4,7 @@
         android:versionName="1.0">
         <overlay android:targetPackage="com.android.systemui"
                 android:requiredSystemPropertyName="ro.boot.prjname"
-                android:requiredSystemPropertyValue="20363"
+                android:requiredSystemPropertyValue="+(20361|20362|20363|20364|20365|20366)"
         android:priority="2036"
         android:isStatic="true" />
 </manifest>

OPPO/A54/AndroidManifest.xml

@@ -4,7 +4,7 @@
         android:versionName="1.0">
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.boot.prjname"
-                android:requiredSystemPropertyValue="20363"
+                android:requiredSystemPropertyValue="+(20361|20362|20363|20364|20365|20366)"
         android:priority="2036"
         android:isStatic="true" />
 </manifest>

OPPO/Reno3Pro-SystemUI/Android.mk → 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

OPPO/Reno3Pro-SystemUI/AndroidManifest.xml → 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>

OPPO/Reno3Pro/Android.mk → 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

OPPO/Reno3Pro/AndroidManifest.xml → 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>

OPPO/Reno3Pro/res/values/config.xml → 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>

Xiaomi/Civi-SystemUI/res/values/config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="status_bar_padding_start">45px</dimen>
-    <dimen name="status_bar_padding_end">45px</dimen>
+    <dimen name="status_bar_padding_start">50px</dimen>
+    <dimen name="status_bar_padding_end">50px</dimen>
     <dimen name="status_bar_header_height_keyguard">125px</dimen>
     <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
     <dimen name="system_icons_keyguard_padding_end">@dimen/status_bar_padding_end</dimen>

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 \