From d2fdc245cdb5ed495a5190c67d1ed80efcef732b Mon Sep 17 00:00:00 2001
From: bengris32 <bengris32@protonmail.ch>
Date: Mon, 26 Sep 2022 15:30:40 +0100
Subject: [PATCH] rosemary: Convert overlays into Runtime Resource Overlays

Signed-off-by: bengris32 <bengris32@protonmail.ch>
Change-Id: I9105bbd5b4cb183b9eed02d15d4ca3134fbcb6d2
---
 device.mk                                     | 13 ++++----
 .../base/core/res/res/values/config.xml       | 30 -------------------
 .../base/core/res/res/values/dimens.xml       | 28 -----------------
 .../CarrierConfigOverlayRosemary/Android.bp   |  2 +-
 .../FrameworksResOverlayRosemary/Android.bp   |  6 ++++
 .../AndroidManifest.xml                       | 21 +++++++++++++
 .../res/values/config.xml                     |  0
 .../res/xml/power_profile.xml                 |  0
 .../TelephonyOverlayRosemary/Android.bp       |  6 ++++
 .../AndroidManifest.xml                       | 20 +++++++++++++
 .../res/values/config.xml                     |  0
 .../Android.bp                                |  2 +-
 .../AndroidManifest.xml                       |  0
 .../res/values/config.xml                     |  0
 .../Android.bp                                |  2 +-
 .../AndroidManifest.xml                       |  0
 .../res/values/config.xml                     |  0
 17 files changed, 63 insertions(+), 67 deletions(-)
 delete mode 100644 overlay-lineage/frameworks/base/core/res/res/values/config.xml
 delete mode 100644 overlay/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 rro_overlays/FrameworksResOverlayRosemary/Android.bp
 create mode 100644 rro_overlays/FrameworksResOverlayRosemary/AndroidManifest.xml
 rename {overlay/frameworks/base/core/res => rro_overlays/FrameworksResOverlayRosemary}/res/values/config.xml (100%)
 rename {overlay/frameworks/base/core/res => rro_overlays/FrameworksResOverlayRosemary}/res/xml/power_profile.xml (100%)
 create mode 100644 rro_overlays/TelephonyOverlayRosemary/Android.bp
 create mode 100644 rro_overlays/TelephonyOverlayRosemary/AndroidManifest.xml
 rename {overlay/packages/services/Telephony => rro_overlays/TelephonyOverlayRosemary}/res/values/config.xml (100%)
 rename rro_overlays/{TetheringOverlay => TetheringConfigOverlayRosemary}/Android.bp (71%)
 rename rro_overlays/{TetheringOverlay => TetheringConfigOverlayRosemary}/AndroidManifest.xml (100%)
 rename rro_overlays/{TetheringOverlay => TetheringConfigOverlayRosemary}/res/values/config.xml (100%)
 rename rro_overlays/{WifiOverlay => WifiOverlayRosemary}/Android.bp (75%)
 rename rro_overlays/{WifiOverlay => WifiOverlayRosemary}/AndroidManifest.xml (100%)
 rename rro_overlays/{WifiOverlay => WifiOverlayRosemary}/res/values/config.xml (100%)

diff --git a/device.mk b/device.mk
index 0fdac91..9e68083 100644
--- a/device.mk
+++ b/device.mk
@@ -233,19 +233,20 @@ PRODUCT_COPY_FILES += \
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay \
     $(LOCAL_PATH)/overlay-lineage
 
-PRODUCT_PACKAGES += \
-    WifiOverlay \
-    TetheringConfigOverlay \
-    CarrierConfigOverlayRosemary
-
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
     $(LOCAL_PATH)/overlay-lineage
 
+PRODUCT_PACKAGES += \
+    CarrierConfigOverlayRosemary \
+    FrameworksResOverlayRosemary \
+    TelephonyOverlayRosemary \
+    TetheringConfigOverlayRosemary \
+    WifiOverlayRosemary
+
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power-service-mediatek
diff --git a/overlay-lineage/frameworks/base/core/res/res/values/config.xml b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 601d05b..0000000
--- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, 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.
-     NOTE: The naming convention is "config_camelCaseValue". Some legacy
-     entries do not follow the convention, but all new entries should. -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="config_locationExtraPackageNames" translatable="false">
-        <!-- ImsService -->
-        <item>com.mediatek.ims</item>
-    </string-array>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
deleted file mode 100644
index d50bd21..0000000
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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.
-*/
--->
-
- <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height_portrait">93.0px</dimen>
-
-    <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius_bottom">106.0px</dimen>
-    <dimen name="rounded_corner_radius_top">106.0px</dimen> 
- </resources>
- 
\ No newline at end of file
diff --git a/rro_overlays/CarrierConfigOverlayRosemary/Android.bp b/rro_overlays/CarrierConfigOverlayRosemary/Android.bp
index 8f766f5..6d88c59 100644
--- a/rro_overlays/CarrierConfigOverlayRosemary/Android.bp
+++ b/rro_overlays/CarrierConfigOverlayRosemary/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "CarrierConfigOverlayRosemary,
+    name: "CarrierConfigOverlayRosemary",
     theme: "CarrierConfigOverlay",
     certificate: "platform",
     sdk_version: "current",
diff --git a/rro_overlays/FrameworksResOverlayRosemary/Android.bp b/rro_overlays/FrameworksResOverlayRosemary/Android.bp
new file mode 100644
index 0000000..24602f9
--- /dev/null
+++ b/rro_overlays/FrameworksResOverlayRosemary/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "FrameworksResOverlayRosemary",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/FrameworksResOverlayRosemary/AndroidManifest.xml b/rro_overlays/FrameworksResOverlayRosemary/AndroidManifest.xml
new file mode 100644
index 0000000..70553db
--- /dev/null
+++ b/rro_overlays/FrameworksResOverlayRosemary/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.frameworksres.overlay.rosemary">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlays/FrameworksResOverlayRosemary/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to rro_overlays/FrameworksResOverlayRosemary/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/rro_overlays/FrameworksResOverlayRosemary/res/xml/power_profile.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml
rename to rro_overlays/FrameworksResOverlayRosemary/res/xml/power_profile.xml
diff --git a/rro_overlays/TelephonyOverlayRosemary/Android.bp b/rro_overlays/TelephonyOverlayRosemary/Android.bp
new file mode 100644
index 0000000..38b1328
--- /dev/null
+++ b/rro_overlays/TelephonyOverlayRosemary/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "TelephonyOverlayRosemary",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlays/TelephonyOverlayRosemary/AndroidManifest.xml b/rro_overlays/TelephonyOverlayRosemary/AndroidManifest.xml
new file mode 100644
index 0000000..ea13e95
--- /dev/null
+++ b/rro_overlays/TelephonyOverlayRosemary/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.telephony.overlay.rosemary">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.phone"
+      android:isStatic="true"
+      android:priority="1"/>
+</manifest>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/rro_overlays/TelephonyOverlayRosemary/res/values/config.xml
similarity index 100%
rename from overlay/packages/services/Telephony/res/values/config.xml
rename to rro_overlays/TelephonyOverlayRosemary/res/values/config.xml
diff --git a/rro_overlays/TetheringOverlay/Android.bp b/rro_overlays/TetheringConfigOverlayRosemary/Android.bp
similarity index 71%
rename from rro_overlays/TetheringOverlay/Android.bp
rename to rro_overlays/TetheringConfigOverlayRosemary/Android.bp
index 05acd79..39f47a0 100644
--- a/rro_overlays/TetheringOverlay/Android.bp
+++ b/rro_overlays/TetheringConfigOverlayRosemary/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "TetheringConfigOverlay",
+    name: "TetheringConfigOverlayRosemary",
     theme: "TetheringConfigOverlay",
     sdk_version: "current",
     vendor: true
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringConfigOverlayRosemary/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/TetheringOverlay/AndroidManifest.xml
rename to rro_overlays/TetheringConfigOverlayRosemary/AndroidManifest.xml
diff --git a/rro_overlays/TetheringOverlay/res/values/config.xml b/rro_overlays/TetheringConfigOverlayRosemary/res/values/config.xml
similarity index 100%
rename from rro_overlays/TetheringOverlay/res/values/config.xml
rename to rro_overlays/TetheringConfigOverlayRosemary/res/values/config.xml
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlayRosemary/Android.bp
similarity index 75%
rename from rro_overlays/WifiOverlay/Android.bp
rename to rro_overlays/WifiOverlayRosemary/Android.bp
index c602c22..20b536c 100644
--- a/rro_overlays/WifiOverlay/Android.bp
+++ b/rro_overlays/WifiOverlayRosemary/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "WifiOverlay",
+    name: "WifiOverlayRosemary",
     theme: "WifiOverlay",
     sdk_version: "current",
     vendor: true
diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlayRosemary/AndroidManifest.xml
similarity index 100%
rename from rro_overlays/WifiOverlay/AndroidManifest.xml
rename to rro_overlays/WifiOverlayRosemary/AndroidManifest.xml
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlayRosemary/res/values/config.xml
similarity index 100%
rename from rro_overlays/WifiOverlay/res/values/config.xml
rename to rro_overlays/WifiOverlayRosemary/res/values/config.xml