From d519ac9aa85fa2db393c7fa3171020d2e21219a2 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 22 Feb 2022 14:26:54 +0800 Subject: [PATCH 1/3] 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 4e2116b5..096328ee 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 5f68e9ce..b3b7367a 100644 --- a/OPPO/Reno3Pro-SystemUI/AndroidManifest.xml +++ b/OPPO/RenoPro2019-SystemUI/AndroidManifest.xml @@ -1,10 +1,10 @@ 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 14baea53..2e3108e5 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 41daa9e4..8742fe24 100644 --- a/OPPO/Reno3Pro/AndroidManifest.xml +++ b/OPPO/RenoPro2019/AndroidManifest.xml @@ -1,10 +1,10 @@ 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 d2bec5c8..3993970f 100644 --- a/OPPO/Reno3Pro/res/values/config.xml +++ b/OPPO/RenoPro2019/res/values/config.xml @@ -10,6 +10,6 @@ 1 - M -540,0 L -540,100 L -409,100 L -409,0 Z - M -540,0 L -540,100 L -409,100 L -409,0 Z + M -540,0 L -540,102 L -408,102 L -408,0 Z + M -540,0 L -540,102 L -408,102 L -408,0 Z diff --git a/overlay.mk b/overlay.mk index 8e296771..698c545d 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 \ From e94572016418f85870b35551dd91171d775850ad Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 22 Feb 2022 14:33:54 +0800 Subject: [PATCH 2/3] Fixup padding for Xiaomi Civi --- Xiaomi/Civi-SystemUI/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Xiaomi/Civi-SystemUI/res/values/config.xml b/Xiaomi/Civi-SystemUI/res/values/config.xml index dd90e3f1..2b2f5a8a 100644 --- a/Xiaomi/Civi-SystemUI/res/values/config.xml +++ b/Xiaomi/Civi-SystemUI/res/values/config.xml @@ -1,7 +1,7 @@ - 45px - 45px + 50px + 50px 125px @dimen/status_bar_padding_start @dimen/status_bar_padding_end From 79563427811664641e2ea53c78a12ba6c128e673 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 22 Feb 2022 14:47:32 +0000 Subject: [PATCH 3/3] Support more variants of OPPO A54 (incl. CPH2241) Change-Id: I2f2252600d6bd5d44ae667bfc4c012e3a296c5d0 --- OPPO/A54-SystemUI/AndroidManifest.xml | 2 +- OPPO/A54/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OPPO/A54-SystemUI/AndroidManifest.xml b/OPPO/A54-SystemUI/AndroidManifest.xml index 2451da6a..31bf5a15 100644 --- a/OPPO/A54-SystemUI/AndroidManifest.xml +++ b/OPPO/A54-SystemUI/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionName="1.0"> diff --git a/OPPO/A54/AndroidManifest.xml b/OPPO/A54/AndroidManifest.xml index 9a898932..9ff40d21 100644 --- a/OPPO/A54/AndroidManifest.xml +++ b/OPPO/A54/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionName="1.0">