From fb892f4c3eb2f07eadb4c839bf3be5536fd6d3a5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 11 Jun 2022 08:00:46 +0800
Subject: [PATCH] OPlus overlay housekeeping

Renaming and removing leftover tags

Change-Id: I014f3c47c221c2b2a37a6b173ed9190b52b8e8e8
---
 .../Android.mk                                     |  2 +-
 .../AndroidManifest.xml                            |  2 +-
 .../res/values/config.xml                          |  0
 {Realme/RMX3366 => OPPO/Reno6-5G}/Android.mk       |  2 +-
 OPPO/{PEQM00 => Reno6-5G}/AndroidManifest.xml      |  2 +-
 .../res/values-land/config.xml                     |  0
 OPPO/{PEQM00 => Reno6-5G}/res/values/config.xml    |  0
 {OPPO/PEQM00 => Realme/8-5G}/Android.mk            |  2 +-
 Realme/{RE513CL1 => 8-5G}/AndroidManifest.xml      |  8 ++++----
 .../{RE513CL1 => 8-5G}/res/values-land/config.xml  |  0
 Realme/{RE513CL1 => 8-5G}/res/values/arrays.xml    |  0
 Realme/{RE513CL1 => 8-5G}/res/values/bools.xml     |  0
 Realme/{RE513CL1 => 8-5G}/res/values/notch.xml     |  0
 .../{RE513CL1 => 8-5G}/res/xml/power_profile.xml   |  0
 Realme/GTMasterExplorer-SystemUI/Android.mk        |  8 ++++++++
 .../AndroidManifest.xml                            |  2 +-
 .../res/values-land/config.xml                     |  0
 .../res/values-v31/config.xml                      |  0
 .../res/values/config.xml                          |  0
 .../Android.mk                                     |  2 +-
 .../AndroidManifest.xml                            |  2 +-
 .../res/values-land/config.xml                     |  0
 .../res/values-sw320dp/dimens.xml                  |  0
 .../res/values-sw338dp/dimens.xml                  |  0
 .../res/values-sw360dp/dimens.xml                  |  0
 .../res/values-sw411dp/dimens.xml                  |  0
 .../res/values-sw454dp/dimens.xml                  |  0
 .../res/values-sw460dp/dimens.xml                  |  0
 .../res/values/config.xml                          |  0
 .../res/xml/power_profile.xml                      |  0
 Realme/GTNeo3-SystemUI/AndroidManifest.xml         |  1 -
 Realme/GTNeo3/AndroidManifest.xml                  |  1 -
 Realme/{RE513CL1 => Q2-SystemUI}/Android.mk        |  2 +-
 .../AndroidManifest.xml                            |  2 +-
 .../res/values-land/config.xml                     |  0
 .../res/values/config.xml                          |  0
 Realme/{RMX2117 => Q2}/Android.mk                  |  2 +-
 Realme/{RMX2117 => Q2}/AndroidManifest.xml         |  2 +-
 Realme/{RMX3366 => Q2}/res/values-land/config.xml  |  0
 Realme/{RMX2117 => Q2}/res/values/config.xml       |  0
 Realme/{RMX2117 => Q2}/res/xml/power_profile.xml   |  0
 Realme/RMX3366-SystemUI/Android.mk                 |  8 --------
 overlay.mk                                         | 14 +++++++-------
 43 files changed, 31 insertions(+), 33 deletions(-)
 rename OPPO/{PEQM00-SystemUI => Reno6-5G-SystemUI}/Android.mk (79%)
 rename OPPO/{PEQM00-SystemUI => Reno6-5G-SystemUI}/AndroidManifest.xml (86%)
 rename OPPO/{PEQM00-SystemUI => Reno6-5G-SystemUI}/res/values/config.xml (100%)
 rename {Realme/RMX3366 => OPPO/Reno6-5G}/Android.mk (81%)
 rename OPPO/{PEQM00 => Reno6-5G}/AndroidManifest.xml (87%)
 rename OPPO/{PEQM00 => Reno6-5G}/res/values-land/config.xml (100%)
 rename OPPO/{PEQM00 => Reno6-5G}/res/values/config.xml (100%)
 rename {OPPO/PEQM00 => Realme/8-5G}/Android.mk (82%)
 rename Realme/{RE513CL1 => 8-5G}/AndroidManifest.xml (70%)
 rename Realme/{RE513CL1 => 8-5G}/res/values-land/config.xml (100%)
 rename Realme/{RE513CL1 => 8-5G}/res/values/arrays.xml (100%)
 rename Realme/{RE513CL1 => 8-5G}/res/values/bools.xml (100%)
 rename Realme/{RE513CL1 => 8-5G}/res/values/notch.xml (100%)
 rename Realme/{RE513CL1 => 8-5G}/res/xml/power_profile.xml (100%)
 create mode 100644 Realme/GTMasterExplorer-SystemUI/Android.mk
 rename Realme/{RMX3366-SystemUI => GTMasterExplorer-SystemUI}/AndroidManifest.xml (84%)
 rename Realme/{RMX2117-SystemUI => GTMasterExplorer-SystemUI}/res/values-land/config.xml (100%)
 rename Realme/{RMX3366-SystemUI => GTMasterExplorer-SystemUI}/res/values-v31/config.xml (100%)
 rename Realme/{RMX3366-SystemUI => GTMasterExplorer-SystemUI}/res/values/config.xml (100%)
 rename Realme/{RMX2117-SystemUI => GTMasterExplorer}/Android.mk (79%)
 rename Realme/{RMX3366 => GTMasterExplorer}/AndroidManifest.xml (85%)
 rename Realme/{RMX2117 => GTMasterExplorer}/res/values-land/config.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values-sw320dp/dimens.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values-sw338dp/dimens.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values-sw360dp/dimens.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values-sw411dp/dimens.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values-sw454dp/dimens.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values-sw460dp/dimens.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/values/config.xml (100%)
 rename Realme/{RMX3366 => GTMasterExplorer}/res/xml/power_profile.xml (100%)
 rename Realme/{RE513CL1 => Q2-SystemUI}/Android.mk (80%)
 rename Realme/{RMX2117-SystemUI => Q2-SystemUI}/AndroidManifest.xml (86%)
 rename Realme/{RMX3366-SystemUI => Q2-SystemUI}/res/values-land/config.xml (100%)
 rename Realme/{RMX2117-SystemUI => Q2-SystemUI}/res/values/config.xml (100%)
 rename Realme/{RMX2117 => Q2}/Android.mk (81%)
 rename Realme/{RMX2117 => Q2}/AndroidManifest.xml (88%)
 rename Realme/{RMX3366 => Q2}/res/values-land/config.xml (100%)
 rename Realme/{RMX2117 => Q2}/res/values/config.xml (100%)
 rename Realme/{RMX2117 => Q2}/res/xml/power_profile.xml (100%)
 delete mode 100644 Realme/RMX3366-SystemUI/Android.mk

diff --git a/OPPO/PEQM00-SystemUI/Android.mk b/OPPO/Reno6-5G-SystemUI/Android.mk
similarity index 79%
rename from OPPO/PEQM00-SystemUI/Android.mk
rename to OPPO/Reno6-5G-SystemUI/Android.mk
index 41bd5a7..dff1712 100644
--- a/OPPO/PEQM00-SystemUI/Android.mk
+++ b/OPPO/Reno6-5G-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-peqm00-systemui
+LOCAL_PACKAGE_NAME := treble-overlay-oppo-reno6-5g-systemui
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/OPPO/PEQM00-SystemUI/AndroidManifest.xml b/OPPO/Reno6-5G-SystemUI/AndroidManifest.xml
similarity index 86%
rename from OPPO/PEQM00-SystemUI/AndroidManifest.xml
rename to OPPO/Reno6-5G-SystemUI/AndroidManifest.xml
index 660a17a..721d337 100644
--- a/OPPO/PEQM00-SystemUI/AndroidManifest.xml
+++ b/OPPO/Reno6-5G-SystemUI/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.oppo.peqm00.systemui"
+        package="me.phh.treble.overlay.oppo.reno6_5g.systemui"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="com.android.systemui"
diff --git a/OPPO/PEQM00-SystemUI/res/values/config.xml b/OPPO/Reno6-5G-SystemUI/res/values/config.xml
similarity index 100%
rename from OPPO/PEQM00-SystemUI/res/values/config.xml
rename to OPPO/Reno6-5G-SystemUI/res/values/config.xml
diff --git a/Realme/RMX3366/Android.mk b/OPPO/Reno6-5G/Android.mk
similarity index 81%
rename from Realme/RMX3366/Android.mk
rename to OPPO/Reno6-5G/Android.mk
index 9213748..0badfb0 100644
--- a/Realme/RMX3366/Android.mk
+++ b/OPPO/Reno6-5G/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-realme-rmx3366
+LOCAL_PACKAGE_NAME := treble-overlay-oppo-reno6-5g
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/OPPO/PEQM00/AndroidManifest.xml b/OPPO/Reno6-5G/AndroidManifest.xml
similarity index 87%
rename from OPPO/PEQM00/AndroidManifest.xml
rename to OPPO/Reno6-5G/AndroidManifest.xml
index 05b07ff..12c60ca 100644
--- a/OPPO/PEQM00/AndroidManifest.xml
+++ b/OPPO/Reno6-5G/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.oppo.peqm00"
+        package="me.phh.treble.overlay.oppo.reno6_5g"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/OPPO/PEQM00/res/values-land/config.xml b/OPPO/Reno6-5G/res/values-land/config.xml
similarity index 100%
rename from OPPO/PEQM00/res/values-land/config.xml
rename to OPPO/Reno6-5G/res/values-land/config.xml
diff --git a/OPPO/PEQM00/res/values/config.xml b/OPPO/Reno6-5G/res/values/config.xml
similarity index 100%
rename from OPPO/PEQM00/res/values/config.xml
rename to OPPO/Reno6-5G/res/values/config.xml
diff --git a/OPPO/PEQM00/Android.mk b/Realme/8-5G/Android.mk
similarity index 82%
rename from OPPO/PEQM00/Android.mk
rename to Realme/8-5G/Android.mk
index 37d98a6..4191f66 100644
--- a/OPPO/PEQM00/Android.mk
+++ b/Realme/8-5G/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-oppo-peqm00
+LOCAL_PACKAGE_NAME := treble-overlay-realme-8-5g
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Realme/RE513CL1/AndroidManifest.xml b/Realme/8-5G/AndroidManifest.xml
similarity index 70%
rename from Realme/RE513CL1/AndroidManifest.xml
rename to Realme/8-5G/AndroidManifest.xml
index 214316c..9d3645f 100644
--- a/Realme/RE513CL1/AndroidManifest.xml
+++ b/Realme/8-5G/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="me.phh.treble.overlay.realme.re513cl1">
-    <overlay 
-	android:isStatic="true" 
-	android:priority="261" 
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="me.phh.treble.overlay.realme.r8_5g">
+    <overlay
+	android:isStatic="true"
+	android:priority="261"
 	android:targetPackage="android"
         android:requiredSystemPropertyName="ro.boot.prjname"
 	android:requiredSystemPropertyValue="(132863|133013)" />
diff --git a/Realme/RE513CL1/res/values-land/config.xml b/Realme/8-5G/res/values-land/config.xml
similarity index 100%
rename from Realme/RE513CL1/res/values-land/config.xml
rename to Realme/8-5G/res/values-land/config.xml
diff --git a/Realme/RE513CL1/res/values/arrays.xml b/Realme/8-5G/res/values/arrays.xml
similarity index 100%
rename from Realme/RE513CL1/res/values/arrays.xml
rename to Realme/8-5G/res/values/arrays.xml
diff --git a/Realme/RE513CL1/res/values/bools.xml b/Realme/8-5G/res/values/bools.xml
similarity index 100%
rename from Realme/RE513CL1/res/values/bools.xml
rename to Realme/8-5G/res/values/bools.xml
diff --git a/Realme/RE513CL1/res/values/notch.xml b/Realme/8-5G/res/values/notch.xml
similarity index 100%
rename from Realme/RE513CL1/res/values/notch.xml
rename to Realme/8-5G/res/values/notch.xml
diff --git a/Realme/RE513CL1/res/xml/power_profile.xml b/Realme/8-5G/res/xml/power_profile.xml
similarity index 100%
rename from Realme/RE513CL1/res/xml/power_profile.xml
rename to Realme/8-5G/res/xml/power_profile.xml
diff --git a/Realme/GTMasterExplorer-SystemUI/Android.mk b/Realme/GTMasterExplorer-SystemUI/Android.mk
new file mode 100644
index 0000000..1b9c8fc
--- /dev/null
+++ b/Realme/GTMasterExplorer-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-realme-gtmasterexplorer-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Realme/RMX3366-SystemUI/AndroidManifest.xml b/Realme/GTMasterExplorer-SystemUI/AndroidManifest.xml
similarity index 84%
rename from Realme/RMX3366-SystemUI/AndroidManifest.xml
rename to Realme/GTMasterExplorer-SystemUI/AndroidManifest.xml
index b537bf8..85d3389 100644
--- a/Realme/RMX3366-SystemUI/AndroidManifest.xml
+++ b/Realme/GTMasterExplorer-SystemUI/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.realme.rmx3366.systemui"
+        package="me.phh.treble.overlay.realme.gtmasterexplorer.systemui"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="com.android.systemui"
diff --git a/Realme/RMX2117-SystemUI/res/values-land/config.xml b/Realme/GTMasterExplorer-SystemUI/res/values-land/config.xml
similarity index 100%
rename from Realme/RMX2117-SystemUI/res/values-land/config.xml
rename to Realme/GTMasterExplorer-SystemUI/res/values-land/config.xml
diff --git a/Realme/RMX3366-SystemUI/res/values-v31/config.xml b/Realme/GTMasterExplorer-SystemUI/res/values-v31/config.xml
similarity index 100%
rename from Realme/RMX3366-SystemUI/res/values-v31/config.xml
rename to Realme/GTMasterExplorer-SystemUI/res/values-v31/config.xml
diff --git a/Realme/RMX3366-SystemUI/res/values/config.xml b/Realme/GTMasterExplorer-SystemUI/res/values/config.xml
similarity index 100%
rename from Realme/RMX3366-SystemUI/res/values/config.xml
rename to Realme/GTMasterExplorer-SystemUI/res/values/config.xml
diff --git a/Realme/RMX2117-SystemUI/Android.mk b/Realme/GTMasterExplorer/Android.mk
similarity index 79%
rename from Realme/RMX2117-SystemUI/Android.mk
rename to Realme/GTMasterExplorer/Android.mk
index 30d196d..ca3146c 100644
--- a/Realme/RMX2117-SystemUI/Android.mk
+++ b/Realme/GTMasterExplorer/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-realme-rmx2117-systemui
+LOCAL_PACKAGE_NAME := treble-overlay-realme-gtmasterexplorer
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Realme/RMX3366/AndroidManifest.xml b/Realme/GTMasterExplorer/AndroidManifest.xml
similarity index 85%
rename from Realme/RMX3366/AndroidManifest.xml
rename to Realme/GTMasterExplorer/AndroidManifest.xml
index 98f1e20..1d0b25f 100644
--- a/Realme/RMX3366/AndroidManifest.xml
+++ b/Realme/GTMasterExplorer/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.realme.rmx3366"
+        package="me.phh.treble.overlay.realme.gtmasterexplorer"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/Realme/RMX2117/res/values-land/config.xml b/Realme/GTMasterExplorer/res/values-land/config.xml
similarity index 100%
rename from Realme/RMX2117/res/values-land/config.xml
rename to Realme/GTMasterExplorer/res/values-land/config.xml
diff --git a/Realme/RMX3366/res/values-sw320dp/dimens.xml b/Realme/GTMasterExplorer/res/values-sw320dp/dimens.xml
similarity index 100%
rename from Realme/RMX3366/res/values-sw320dp/dimens.xml
rename to Realme/GTMasterExplorer/res/values-sw320dp/dimens.xml
diff --git a/Realme/RMX3366/res/values-sw338dp/dimens.xml b/Realme/GTMasterExplorer/res/values-sw338dp/dimens.xml
similarity index 100%
rename from Realme/RMX3366/res/values-sw338dp/dimens.xml
rename to Realme/GTMasterExplorer/res/values-sw338dp/dimens.xml
diff --git a/Realme/RMX3366/res/values-sw360dp/dimens.xml b/Realme/GTMasterExplorer/res/values-sw360dp/dimens.xml
similarity index 100%
rename from Realme/RMX3366/res/values-sw360dp/dimens.xml
rename to Realme/GTMasterExplorer/res/values-sw360dp/dimens.xml
diff --git a/Realme/RMX3366/res/values-sw411dp/dimens.xml b/Realme/GTMasterExplorer/res/values-sw411dp/dimens.xml
similarity index 100%
rename from Realme/RMX3366/res/values-sw411dp/dimens.xml
rename to Realme/GTMasterExplorer/res/values-sw411dp/dimens.xml
diff --git a/Realme/RMX3366/res/values-sw454dp/dimens.xml b/Realme/GTMasterExplorer/res/values-sw454dp/dimens.xml
similarity index 100%
rename from Realme/RMX3366/res/values-sw454dp/dimens.xml
rename to Realme/GTMasterExplorer/res/values-sw454dp/dimens.xml
diff --git a/Realme/RMX3366/res/values-sw460dp/dimens.xml b/Realme/GTMasterExplorer/res/values-sw460dp/dimens.xml
similarity index 100%
rename from Realme/RMX3366/res/values-sw460dp/dimens.xml
rename to Realme/GTMasterExplorer/res/values-sw460dp/dimens.xml
diff --git a/Realme/RMX3366/res/values/config.xml b/Realme/GTMasterExplorer/res/values/config.xml
similarity index 100%
rename from Realme/RMX3366/res/values/config.xml
rename to Realme/GTMasterExplorer/res/values/config.xml
diff --git a/Realme/RMX3366/res/xml/power_profile.xml b/Realme/GTMasterExplorer/res/xml/power_profile.xml
similarity index 100%
rename from Realme/RMX3366/res/xml/power_profile.xml
rename to Realme/GTMasterExplorer/res/xml/power_profile.xml
diff --git a/Realme/GTNeo3-SystemUI/AndroidManifest.xml b/Realme/GTNeo3-SystemUI/AndroidManifest.xml
index a9614d7..8670e11 100644
--- a/Realme/GTNeo3-SystemUI/AndroidManifest.xml
+++ b/Realme/GTNeo3-SystemUI/AndroidManifest.xml
@@ -2,7 +2,6 @@
         package="me.phh.treble.overlay.realme.gtneo3.systemui"
         android:versionCode="1"
         android:versionName="1.0">
-        <application />
         <overlay android:targetPackage="com.android.systemui"
                 android:requiredSystemPropertyName="ro.boot.prjname"
                 android:requiredSystemPropertyValue="+(21641|21642)"
diff --git a/Realme/GTNeo3/AndroidManifest.xml b/Realme/GTNeo3/AndroidManifest.xml
index b0c7e03..50cc858 100644
--- a/Realme/GTNeo3/AndroidManifest.xml
+++ b/Realme/GTNeo3/AndroidManifest.xml
@@ -2,7 +2,6 @@
         package="me.phh.treble.overlay.realme.gtneo3"
         android:versionCode="1"
         android:versionName="1.0">
-        <application />
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.boot.prjname"
                 android:requiredSystemPropertyValue="+(21641|21642)"
diff --git a/Realme/RE513CL1/Android.mk b/Realme/Q2-SystemUI/Android.mk
similarity index 80%
rename from Realme/RE513CL1/Android.mk
rename to Realme/Q2-SystemUI/Android.mk
index c496b2e..7621971 100644
--- a/Realme/RE513CL1/Android.mk
+++ b/Realme/Q2-SystemUI/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-realme-re513cl1
+LOCAL_PACKAGE_NAME := treble-overlay-realme-q2-systemui
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Realme/RMX2117-SystemUI/AndroidManifest.xml b/Realme/Q2-SystemUI/AndroidManifest.xml
similarity index 86%
rename from Realme/RMX2117-SystemUI/AndroidManifest.xml
rename to Realme/Q2-SystemUI/AndroidManifest.xml
index 8c7f677..8ff5142 100644
--- a/Realme/RMX2117-SystemUI/AndroidManifest.xml
+++ b/Realme/Q2-SystemUI/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.realme.rmx2117.systemui"
+        package="me.phh.treble.overlay.realme.q2.systemui"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="com.android.systemui"
diff --git a/Realme/RMX3366-SystemUI/res/values-land/config.xml b/Realme/Q2-SystemUI/res/values-land/config.xml
similarity index 100%
rename from Realme/RMX3366-SystemUI/res/values-land/config.xml
rename to Realme/Q2-SystemUI/res/values-land/config.xml
diff --git a/Realme/RMX2117-SystemUI/res/values/config.xml b/Realme/Q2-SystemUI/res/values/config.xml
similarity index 100%
rename from Realme/RMX2117-SystemUI/res/values/config.xml
rename to Realme/Q2-SystemUI/res/values/config.xml
diff --git a/Realme/RMX2117/Android.mk b/Realme/Q2/Android.mk
similarity index 81%
rename from Realme/RMX2117/Android.mk
rename to Realme/Q2/Android.mk
index 3553708..e4c582b 100644
--- a/Realme/RMX2117/Android.mk
+++ b/Realme/Q2/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-realme-rmx2117
+LOCAL_PACKAGE_NAME := treble-overlay-realme-q2
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Realme/RMX2117/AndroidManifest.xml b/Realme/Q2/AndroidManifest.xml
similarity index 88%
rename from Realme/RMX2117/AndroidManifest.xml
rename to Realme/Q2/AndroidManifest.xml
index d9e8e38..d45c296 100644
--- a/Realme/RMX2117/AndroidManifest.xml
+++ b/Realme/Q2/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.realme.rmx2117"
+        package="me.phh.treble.overlay.realme.q2"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
diff --git a/Realme/RMX3366/res/values-land/config.xml b/Realme/Q2/res/values-land/config.xml
similarity index 100%
rename from Realme/RMX3366/res/values-land/config.xml
rename to Realme/Q2/res/values-land/config.xml
diff --git a/Realme/RMX2117/res/values/config.xml b/Realme/Q2/res/values/config.xml
similarity index 100%
rename from Realme/RMX2117/res/values/config.xml
rename to Realme/Q2/res/values/config.xml
diff --git a/Realme/RMX2117/res/xml/power_profile.xml b/Realme/Q2/res/xml/power_profile.xml
similarity index 100%
rename from Realme/RMX2117/res/xml/power_profile.xml
rename to Realme/Q2/res/xml/power_profile.xml
diff --git a/Realme/RMX3366-SystemUI/Android.mk b/Realme/RMX3366-SystemUI/Android.mk
deleted file mode 100644
index 2872336..0000000
--- a/Realme/RMX3366-SystemUI/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-realme-rmx3366-systemui
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_PACKAGE)
diff --git a/overlay.mk b/overlay.mk
index 6480be6..7531c12 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -114,25 +114,25 @@ PRODUCT_PACKAGES += \
 	treble-overlay-oneplus-op8-systemui \
 	treble-overlay-oppo-a54 \
 	treble-overlay-oppo-a54-systemui \
-	treble-overlay-oppo-peqm00 \
-	treble-overlay-oppo-peqm00-systemui \
+	treble-overlay-oppo-reno6-5g \
+	treble-overlay-oppo-reno6-5g-systemui \
 	treble-overlay-oppo-renopro2019 \
 	treble-overlay-oppo-renopro2019-systemui \
 	treble-overlay-oukitel-wp8pro \
 	treble-overlay-razer-cheryl \
 	treble-overlay-realme-6 \
 	treble-overlay-realme-6i \
+	treble-overlay-realme-8-5g \
 	treble-overlay-realme-c2 \
 	treble-overlay-realme-c3 \
+	treble-overlay-realme-gtmasterexplorer \
+	treble-overlay-realme-gtmasterexplorer-systemui \
 	treble-overlay-realme-gtneo3 \
 	treble-overlay-realme-gtneo3-systemui \
 	treble-overlay-realme-narzo10a \
+	treble-overlay-realme-q2 \
+	treble-overlay-realme-q2-systemui \
 	treble-overlay-realme-q3 \
-	treble-overlay-realme-re513cl1 \
-	treble-overlay-realme-rmx2117 \
-	treble-overlay-realme-rmx2117-systemui \
-	treble-overlay-realme-rmx3366 \
-	treble-overlay-realme-rmx3366-systemui \
 	treble-overlay-realme-x2pro \
 	treble-overlay-samsung-S10pq \
 	treble-overlay-samsung-S10q \