From ae4b1288ef7ad3c8195ddb95ed18b9ae5f5f62c9 Mon Sep 17 00:00:00 2001
From: takumi021 <omrameshpatel@gmail.com>
Date: Mon, 12 Dec 2022 18:33:20 +0000
Subject: [PATCH] r5x: Convert overlays to rro_overlay

---
 device.mk                                     | 21 +++++-----
 .../core/res/res/values/custom_config.xml     |  5 ---
 .../base/core/res/res/values/strings.xml      | 25 ------------
 .../res/values/config.xml                     | 23 -----------
 .../services/Telecomm/res/values/config.xml   | 39 -------------------
 rro_overlay/BluetoothOverlay/Andoroid.bp      |  6 +++
 .../BluetoothOverlay/AndoroidManifest.xml     |  6 +++
 .../BluetoothOverlay}/res/values/config.xml   |  0
 rro_overlay/CarrierConfigOverlay/Android.bp   |  6 +++
 .../CarrierConfigOverlay/AndroidManifest.xml  | 13 +++++++
 .../CarrierConfigOverlay}/res/xml/vendor.xml  |  0
 rro_overlay/FrameworksOverlay/Android.bp      |  6 +++
 .../FrameworksOverlay/AndroidManifest.xml     | 13 +++++++
 .../FrameworksOverlay}/res/values/config.xml  |  5 +++
 .../FrameworksOverlay}/res/values/dimens.xml  |  0
 .../res/xml/power_profile.xml                 |  0
 rro_overlay/SettingsOverlay/Android.bp        |  6 +++
 .../SettingsOverlay/AndroidManifest.xml       | 13 +++++++
 .../SettingsOverlay}/res/values/arrays.xml    |  0
 .../SettingsOverlay}/res/values/bools.xml     |  0
 .../SettingsOverlay}/res/values/config.xml    |  0
 .../SettingsProviderOverlay/Android.bp        |  6 +++
 .../AndroidManifest.xml                       | 13 +++++++
 .../res/values/defaults.xml                   |  0
 rro_overlay/SystemUIOverlay/Android.bp        |  6 +++
 .../SystemUIOverlay/AndroidManifest.xml       | 13 +++++++
 .../SystemUIOverlay}/res/drawable/rounded.xml |  0
 .../SystemUIOverlay}/res/values/config.xml    |  0
 .../SystemUIOverlay}/res/values/dimens.xml    |  0
 rro_overlay/TelephonyOverlay/Android.bp       |  6 +++
 .../TelephonyOverlay/AndroidManifest.xml      | 13 +++++++
 .../TelephonyOverlay}/res/values/config.xml   |  0
 .../TetheringOverlay/Android.bp               |  0
 .../TetheringOverlay/AndroidManifest.xml      |  0
 .../TetheringOverlay/res/values/config.xml    |  0
 .../WifiOverlay/Android.bp                    |  0
 .../WifiOverlay/AndroidManifest.xml           |  0
 .../WifiOverlay/res/values/config.xml         |  4 ++
 38 files changed, 147 insertions(+), 101 deletions(-)
 delete mode 100644 overlay/frameworks/base/core/res/res/values/custom_config.xml
 delete mode 100644 overlay/frameworks/base/core/res/res/values/strings.xml
 delete mode 100644 overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml
 delete mode 100644 overlay/packages/services/Telecomm/res/values/config.xml
 create mode 100644 rro_overlay/BluetoothOverlay/Andoroid.bp
 create mode 100644 rro_overlay/BluetoothOverlay/AndoroidManifest.xml
 rename {overlay/packages/apps/Bluetooth => rro_overlay/BluetoothOverlay}/res/values/config.xml (100%)
 create mode 100644 rro_overlay/CarrierConfigOverlay/Android.bp
 create mode 100644 rro_overlay/CarrierConfigOverlay/AndroidManifest.xml
 rename {overlay/packages/apps/CarrierConfig => rro_overlay/CarrierConfigOverlay}/res/xml/vendor.xml (100%)
 create mode 100644 rro_overlay/FrameworksOverlay/Android.bp
 create mode 100644 rro_overlay/FrameworksOverlay/AndroidManifest.xml
 rename {overlay/frameworks/base/core/res => rro_overlay/FrameworksOverlay}/res/values/config.xml (99%)
 rename {overlay/frameworks/base/core/res => rro_overlay/FrameworksOverlay}/res/values/dimens.xml (100%)
 rename {overlay/frameworks/base/core/res => rro_overlay/FrameworksOverlay}/res/xml/power_profile.xml (100%)
 create mode 100644 rro_overlay/SettingsOverlay/Android.bp
 create mode 100644 rro_overlay/SettingsOverlay/AndroidManifest.xml
 rename {overlay/packages/apps/Settings => rro_overlay/SettingsOverlay}/res/values/arrays.xml (100%)
 rename {overlay/packages/apps/Settings => rro_overlay/SettingsOverlay}/res/values/bools.xml (100%)
 rename {overlay/packages/apps/Settings => rro_overlay/SettingsOverlay}/res/values/config.xml (100%)
 create mode 100644 rro_overlay/SettingsProviderOverlay/Android.bp
 create mode 100644 rro_overlay/SettingsProviderOverlay/AndroidManifest.xml
 rename {overlay/frameworks/base/packages/SettingsProvider => rro_overlay/SettingsProviderOverlay}/res/values/defaults.xml (100%)
 create mode 100644 rro_overlay/SystemUIOverlay/Android.bp
 create mode 100644 rro_overlay/SystemUIOverlay/AndroidManifest.xml
 rename {overlay/frameworks/base/packages/SystemUI => rro_overlay/SystemUIOverlay}/res/drawable/rounded.xml (100%)
 rename {overlay/frameworks/base/packages/SystemUI => rro_overlay/SystemUIOverlay}/res/values/config.xml (100%)
 rename {overlay/frameworks/base/packages/SystemUI => rro_overlay/SystemUIOverlay}/res/values/dimens.xml (100%)
 create mode 100644 rro_overlay/TelephonyOverlay/Android.bp
 create mode 100644 rro_overlay/TelephonyOverlay/AndroidManifest.xml
 rename {overlay/packages/services/Telephony => rro_overlay/TelephonyOverlay}/res/values/config.xml (100%)
 rename {rro_overlays => rro_overlay}/TetheringOverlay/Android.bp (100%)
 rename {rro_overlays => rro_overlay}/TetheringOverlay/AndroidManifest.xml (100%)
 rename {rro_overlays => rro_overlay}/TetheringOverlay/res/values/config.xml (100%)
 rename {rro_overlays => rro_overlay}/WifiOverlay/Android.bp (100%)
 rename {rro_overlays => rro_overlay}/WifiOverlay/AndroidManifest.xml (100%)
 rename {rro_overlays => rro_overlay}/WifiOverlay/res/values/config.xml (96%)

diff --git a/device.mk b/device.mk
index 1cb8fd594..fd2308ac1 100644
--- a/device.mk
+++ b/device.mk
@@ -7,10 +7,6 @@
 # RealmeDirac
 $(call inherit-product, $(LOCAL_PATH)/app/RealmeDirac/dirac.mk)
 
-# Overlays
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay
-
 OVERRIDE_PRODUCT_COMPRESSED_APEX := false
 
 # Soong namespaces
@@ -340,6 +336,18 @@ PRODUCT_PACKAGES += \
     libstagefrighthw \
     vendor.qti.hardware.capabilityconfigstore@1.0.vendor
 
+# Overlays
+PRODUCT_PACKAGES += \
+    CarrierConfigOverlay \
+    TelephonyOverlay \
+    SettingsProviderOveray \
+    SettingsOverlay \
+    SystemUIOverlay \
+    WifiOverlay \
+    FrameworksOverlay \
+    TetheringCOverlay \
+    BluetoothOverlay
+
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power-service.r5x-libperfmgr \
@@ -429,10 +437,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \
     frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml
 
-# Tethering
-PRODUCT_PACKAGES += \
-    TetheringConfigOverlay
-
 # Tetheroffload
 PRODUCT_PACKAGES += \
     ipacm \
@@ -468,7 +472,6 @@ PRODUCT_PACKAGES += \
     libwifi-hal-ctrl \
     libwifi-hal-qcom \
     libwpa_client \
-    WifiOverlay \
     wpa_cli \
     wpa_supplicant \
     wpa_supplicant.conf \
diff --git a/overlay/frameworks/base/core/res/res/values/custom_config.xml b/overlay/frameworks/base/core/res/res/values/custom_config.xml
deleted file mode 100644
index 2b8df37e6..000000000
--- a/overlay/frameworks/base/core/res/res/values/custom_config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-    <!-- List of comma separated package names for which we the system will not show crash, ANR,
-         etc. dialogs. -->
-    <string name="config_appsNotReportingCrashes">com.google.android.tts</string>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/strings.xml b/overlay/frameworks/base/core/res/res/values/strings.xml
deleted file mode 100644
index 92079d15b..000000000
--- a/overlay/frameworks/base/core/res/res/values/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds.  Do not translate. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Do not translate. Default access point SSID used for tethering -->
-    <string name="wifi_tether_configure_ssid_default" translatable="false">Realme 5 Series</string>
-</resources>
diff --git a/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml b/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml
deleted file mode 100644
index 917411e78..000000000
--- a/overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2012, The Linux Foundation. All rights reserved.
-
-    Not a Contribution, Apache license notifications and license are retained
-    for attribution purposes only.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether to enable CMAS settings (United States) -->
-    <bool name="show_cmas_settings">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telecomm/res/values/config.xml b/overlay/packages/services/Telecomm/res/values/config.xml
deleted file mode 100644
index a65c1c616..000000000
--- a/overlay/packages/services/Telecomm/res/values/config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted (subject to the limitations in the
-     disclaimer below) provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of the Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-     NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-     GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-     HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-     LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<!-- Telecomm app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Flag indicating if the tty is enabled -->
-    <bool name="tty_enabled">true</bool>
-    <!-- Flag indicating if the speed up audio on mt call code should be executed
-    <bool name="config_speed_up_audio_on_mt_calls">true</bool> -->
-</resources>
diff --git a/rro_overlay/BluetoothOverlay/Andoroid.bp b/rro_overlay/BluetoothOverlay/Andoroid.bp
new file mode 100644
index 000000000..0f12f5ef0
--- /dev/null
+++ b/rro_overlay/BluetoothOverlay/Andoroid.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "BluetoothOverlay",
+    theme: "BluetoothOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/BluetoothOverlay/AndoroidManifest.xml b/rro_overlay/BluetoothOverlay/AndoroidManifest.xml
new file mode 100644
index 000000000..c9ea075e1
--- /dev/null
+++ b/rro_overlay/BluetoothOverlay/AndoroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    coreApp="true"
+    package="com.android.bluetooth.overlay.realme_r5x">
+    <overlay android:targetPackage="com.android.bluetooth" android:targetName="BluetoothCustomization" android:isStatic="true" />
+</manifest>
diff --git a/overlay/packages/apps/Bluetooth/res/values/config.xml b/rro_overlay/BluetoothOverlay/res/values/config.xml
similarity index 100%
rename from overlay/packages/apps/Bluetooth/res/values/config.xml
rename to rro_overlay/BluetoothOverlay/res/values/config.xml
diff --git a/rro_overlay/CarrierConfigOverlay/Android.bp b/rro_overlay/CarrierConfigOverlay/Android.bp
new file mode 100644
index 000000000..1e04d46bf
--- /dev/null
+++ b/rro_overlay/CarrierConfigOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "CarrierConfigOverlay",
+    theme: "CarrierConfigOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlay/CarrierConfigOverlay/AndroidManifest.xml
new file mode 100644
index 000000000..5e817601e
--- /dev/null
+++ b/rro_overlay/CarrierConfigOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The PixelExperience Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.carrierconfig.overlay.realme_r5x">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="550"
+        android:targetPackage="com.android.carrierconfig" />
+</manifest>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/rro_overlay/CarrierConfigOverlay/res/xml/vendor.xml
similarity index 100%
rename from overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
rename to rro_overlay/CarrierConfigOverlay/res/xml/vendor.xml
diff --git a/rro_overlay/FrameworksOverlay/Android.bp b/rro_overlay/FrameworksOverlay/Android.bp
new file mode 100644
index 000000000..bf0b2d15e
--- /dev/null
+++ b/rro_overlay/FrameworksOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "FrameworksOverlay",
+    theme: "FrameworksOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/FrameworksOverlay/AndroidManifest.xml b/rro_overlay/FrameworksOverlay/AndroidManifest.xml
new file mode 100644
index 000000000..f36d6a70a
--- /dev/null
+++ b/rro_overlay/FrameworksOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The PixelExperience Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.overlay.realme_r5x">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="550"
+        android:targetPackage="android" />
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlay/FrameworksOverlay/res/values/config.xml
similarity index 99%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to rro_overlay/FrameworksOverlay/res/values/config.xml
index c1c1750c9..6ae2f3be3 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/rro_overlay/FrameworksOverlay/res/values/config.xml
@@ -462,4 +462,9 @@
 
     <!-- If this is true, device supports Sustained Performance Mode. -->
     <bool name="config_sustainedPerformanceModeSupported">true</bool>
+
+    <!-- List of comma separated package names for which we the system will not show crash, ANR,
+         etc. dialogs. -->
+    <string name="config_appsNotReportingCrashes">com.google.android.tts</string>
+
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/rro_overlay/FrameworksOverlay/res/values/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/dimens.xml
rename to rro_overlay/FrameworksOverlay/res/values/dimens.xml
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/rro_overlay/FrameworksOverlay/res/xml/power_profile.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml
rename to rro_overlay/FrameworksOverlay/res/xml/power_profile.xml
diff --git a/rro_overlay/SettingsOverlay/Android.bp b/rro_overlay/SettingsOverlay/Android.bp
new file mode 100644
index 000000000..7fca64291
--- /dev/null
+++ b/rro_overlay/SettingsOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "SettingsOverlay",
+    theme: "SettingsOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/SettingsOverlay/AndroidManifest.xml b/rro_overlay/SettingsOverlay/AndroidManifest.xml
new file mode 100644
index 000000000..4a55178bf
--- /dev/null
+++ b/rro_overlay/SettingsOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The PixelExperience Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.realme_r5x">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="550"
+        android:targetPackage="com.android.settings" />
+</manifest>
diff --git a/overlay/packages/apps/Settings/res/values/arrays.xml b/rro_overlay/SettingsOverlay/res/values/arrays.xml
similarity index 100%
rename from overlay/packages/apps/Settings/res/values/arrays.xml
rename to rro_overlay/SettingsOverlay/res/values/arrays.xml
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/rro_overlay/SettingsOverlay/res/values/bools.xml
similarity index 100%
rename from overlay/packages/apps/Settings/res/values/bools.xml
rename to rro_overlay/SettingsOverlay/res/values/bools.xml
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/rro_overlay/SettingsOverlay/res/values/config.xml
similarity index 100%
rename from overlay/packages/apps/Settings/res/values/config.xml
rename to rro_overlay/SettingsOverlay/res/values/config.xml
diff --git a/rro_overlay/SettingsProviderOverlay/Android.bp b/rro_overlay/SettingsProviderOverlay/Android.bp
new file mode 100644
index 000000000..5a94eb821
--- /dev/null
+++ b/rro_overlay/SettingsProviderOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "SettingsProviderOverlay",
+    theme: "SettingsProviderOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/SettingsProviderOverlay/AndroidManifest.xml b/rro_overlay/SettingsProviderOverlay/AndroidManifest.xml
new file mode 100644
index 000000000..8bde804c7
--- /dev/null
+++ b/rro_overlay/SettingsProviderOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The PixelExperience Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.settingsprovider.overlay.realme_r5x">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="550"
+        android:targetPackage="com.android.providers.settings" />
+</manifest>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/rro_overlay/SettingsProviderOverlay/res/values/defaults.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to rro_overlay/SettingsProviderOverlay/res/values/defaults.xml
diff --git a/rro_overlay/SystemUIOverlay/Android.bp b/rro_overlay/SystemUIOverlay/Android.bp
new file mode 100644
index 000000000..2ef4e2b95
--- /dev/null
+++ b/rro_overlay/SystemUIOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "SystemUIOverlay",
+    theme: "SystemUIOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/SystemUIOverlay/AndroidManifest.xml b/rro_overlay/SystemUIOverlay/AndroidManifest.xml
new file mode 100644
index 000000000..69fe098ab
--- /dev/null
+++ b/rro_overlay/SystemUIOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The PixelExperience Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.systemui.overlay.realme_r5x">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="550"
+        android:targetPackage="com.android.systemui" />
+</manifest>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/rro_overlay/SystemUIOverlay/res/drawable/rounded.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
rename to rro_overlay/SystemUIOverlay/res/drawable/rounded.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/rro_overlay/SystemUIOverlay/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/config.xml
rename to rro_overlay/SystemUIOverlay/res/values/config.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/rro_overlay/SystemUIOverlay/res/values/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
rename to rro_overlay/SystemUIOverlay/res/values/dimens.xml
diff --git a/rro_overlay/TelephonyOverlay/Android.bp b/rro_overlay/TelephonyOverlay/Android.bp
new file mode 100644
index 000000000..1ba76ba4c
--- /dev/null
+++ b/rro_overlay/TelephonyOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "TelephonyOverlay",
+    theme: "TelephonyOverlay",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/rro_overlay/TelephonyOverlay/AndroidManifest.xml b/rro_overlay/TelephonyOverlay/AndroidManifest.xml
new file mode 100644
index 000000000..004e73f8b
--- /dev/null
+++ b/rro_overlay/TelephonyOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The PixelExperience Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.phone.overlay.realme_r5x">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="550"
+        android:targetPackage="com.android.phone" />
+</manifest>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/rro_overlay/TelephonyOverlay/res/values/config.xml
similarity index 100%
rename from overlay/packages/services/Telephony/res/values/config.xml
rename to rro_overlay/TelephonyOverlay/res/values/config.xml
diff --git a/rro_overlays/TetheringOverlay/Android.bp b/rro_overlay/TetheringOverlay/Android.bp
similarity index 100%
rename from rro_overlays/TetheringOverlay/Android.bp
rename to rro_overlay/TetheringOverlay/Android.bp
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlay/TetheringOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/TetheringOverlay/AndroidManifest.xml
rename to rro_overlay/TetheringOverlay/AndroidManifest.xml
diff --git a/rro_overlays/TetheringOverlay/res/values/config.xml b/rro_overlay/TetheringOverlay/res/values/config.xml
similarity index 100%
rename from rro_overlays/TetheringOverlay/res/values/config.xml
rename to rro_overlay/TetheringOverlay/res/values/config.xml
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlay/WifiOverlay/Android.bp
similarity index 100%
rename from rro_overlays/WifiOverlay/Android.bp
rename to rro_overlay/WifiOverlay/Android.bp
diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlay/WifiOverlay/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/WifiOverlay/AndroidManifest.xml
rename to rro_overlay/WifiOverlay/AndroidManifest.xml
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlay/WifiOverlay/res/values/config.xml
similarity index 96%
rename from rro_overlays/WifiOverlay/res/values/config.xml
rename to rro_overlay/WifiOverlay/res/values/config.xml
index 8d765f10a..8b63a9323 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlay/WifiOverlay/res/values/config.xml
@@ -82,4 +82,8 @@
 
     <!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
     <integer translatable="false" name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>
+
+    <!-- Do not translate. Default access point SSID used for tethering -->
+    <string name="wifi_tether_configure_ssid_default" translatable="false">Realme 5 Series</string>
+
 </resources>