From 0be2f0d3f718e7d7b0728af775913bdc0c3777e7 Mon Sep 17 00:00:00 2001
From: Ahmad Rulim <personal@rulim34.dev>
Date: Sat, 31 Dec 2022 21:51:16 +0700
Subject: veux: overlay: Move to product partition

Signed-off-by: Ahmad Rulim <personal@rulim34.dev>
---
 rro_overlays/CarrierConfigOverlayVeux/Android.bp             |  3 +--
 rro_overlays/CarrierConfigOverlayVeux/AndroidManifest.xml    |  7 +++----
 rro_overlays/CarrierConfigOverlayVeux/res/xml/vendor.xml     |  1 -
 rro_overlays/DialerOverlayVeux/Android.bp                    |  3 +--
 rro_overlays/DialerOverlayVeux/AndroidManifest.xml           |  8 ++++----
 rro_overlays/DialerOverlayVeux/res/values/config.xml         |  2 +-
 rro_overlays/FrameworksResOverlayVeux/Android.bp             |  3 +--
 rro_overlays/FrameworksResOverlayVeux/AndroidManifest.xml    |  9 ++++-----
 rro_overlays/FrameworksResOverlayVeux/res/values/dimens.xml  |  2 +-
 .../FrameworksResOverlayVeux/res/xml/power_profile.xml       |  2 +-
 rro_overlays/SettingsOverlayVeux/Android.bp                  |  3 +--
 rro_overlays/SettingsOverlayVeux/AndroidManifest.xml         |  8 ++++----
 rro_overlays/SettingsProviderOverlayVeux/Android.bp          |  3 +--
 rro_overlays/SettingsProviderOverlayVeux/AndroidManifest.xml | 10 +++++-----
 .../SettingsProviderOverlayVeux/res/values/defaults.xml      |  4 ++--
 rro_overlays/SystemUIOverlayVeux/Android.bp                  |  3 +--
 rro_overlays/SystemUIOverlayVeux/AndroidManifest.xml         |  8 ++++----
 rro_overlays/TelephonyOverlayVeux/Android.bp                 |  3 +--
 rro_overlays/TelephonyOverlayVeux/AndroidManifest.xml        | 10 +++++-----
 rro_overlays/TelephonyOverlayVeux/res/values/config.xml      |  2 +-
 rro_overlays/WifiOverlayVeux/AndroidManifest.xml             | 12 ++++++------
 21 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/rro_overlays/CarrierConfigOverlayVeux/Android.bp b/rro_overlays/CarrierConfigOverlayVeux/Android.bp
index 6295b0d..3325628 100644
--- a/rro_overlays/CarrierConfigOverlayVeux/Android.bp
+++ b/rro_overlays/CarrierConfigOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "CarrierConfigOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/CarrierConfigOverlayVeux/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlayVeux/AndroidManifest.xml
index 1bb6876..493ccc2 100644
--- a/rro_overlays/CarrierConfigOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/CarrierConfigOverlayVeux/AndroidManifest.xml
@@ -14,8 +14,7 @@
     package="com.android.carrierconfig.overlay.veux">
 
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.carrierconfig"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="com.android.carrierconfig"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/CarrierConfigOverlayVeux/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlayVeux/res/xml/vendor.xml
index a4359fa..b8e2d76 100644
--- a/rro_overlays/CarrierConfigOverlayVeux/res/xml/vendor.xml
+++ b/rro_overlays/CarrierConfigOverlayVeux/res/xml/vendor.xml
@@ -2663,4 +2663,3 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
         </string-array>
     </carrier_config>
 </carrier_config_list>
-
diff --git a/rro_overlays/DialerOverlayVeux/Android.bp b/rro_overlays/DialerOverlayVeux/Android.bp
index 809b8e7..66c2c7a 100644
--- a/rro_overlays/DialerOverlayVeux/Android.bp
+++ b/rro_overlays/DialerOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "DialerOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/DialerOverlayVeux/AndroidManifest.xml b/rro_overlays/DialerOverlayVeux/AndroidManifest.xml
index 7fbf181..257e63e 100644
--- a/rro_overlays/DialerOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/DialerOverlayVeux/AndroidManifest.xml
@@ -12,9 +12,9 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.dialer.overlay.veux">
+
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.dialer"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="com.android.dialer"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/DialerOverlayVeux/res/values/config.xml b/rro_overlays/DialerOverlayVeux/res/values/config.xml
index 4bf1b07..b77ce39 100644
--- a/rro_overlays/DialerOverlayVeux/res/values/config.xml
+++ b/rro_overlays/DialerOverlayVeux/res/values/config.xml
@@ -16,4 +16,4 @@
     <bool name="call_recording_enabled">true</bool>
     <integer name="call_recording_audio_source">4</integer>
     
-</resources>
\ No newline at end of file
+</resources>
diff --git a/rro_overlays/FrameworksResOverlayVeux/Android.bp b/rro_overlays/FrameworksResOverlayVeux/Android.bp
index 73a4e13..cb70f75 100644
--- a/rro_overlays/FrameworksResOverlayVeux/Android.bp
+++ b/rro_overlays/FrameworksResOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "FrameworksResOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/FrameworksResOverlayVeux/AndroidManifest.xml b/rro_overlays/FrameworksResOverlayVeux/AndroidManifest.xml
index 9a1f441..54a4269 100644
--- a/rro_overlays/FrameworksResOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/FrameworksResOverlayVeux/AndroidManifest.xml
@@ -11,11 +11,10 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworksres.overlay.veux">
+    package="android.overlay.veux">
 
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="android"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="android"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/FrameworksResOverlayVeux/res/values/dimens.xml b/rro_overlays/FrameworksResOverlayVeux/res/values/dimens.xml
index 52886cd..0758d1a 100644
--- a/rro_overlays/FrameworksResOverlayVeux/res/values/dimens.xml
+++ b/rro_overlays/FrameworksResOverlayVeux/res/values/dimens.xml
@@ -24,4 +24,4 @@
     <dimen name="status_bar_height_landscape">28dp</dimen>
     <dimen name="status_bar_height_portrait">94px</dimen>
     
-</resources>
\ No newline at end of file
+</resources>
diff --git a/rro_overlays/FrameworksResOverlayVeux/res/xml/power_profile.xml b/rro_overlays/FrameworksResOverlayVeux/res/xml/power_profile.xml
index ca652af..b1db4d9 100644
--- a/rro_overlays/FrameworksResOverlayVeux/res/xml/power_profile.xml
+++ b/rro_overlays/FrameworksResOverlayVeux/res/xml/power_profile.xml
@@ -105,4 +105,4 @@
         <value>0</value>
     </array>
     <item name="gps.voltage">0</item>
-</device>
\ No newline at end of file
+</device>
diff --git a/rro_overlays/SettingsOverlayVeux/Android.bp b/rro_overlays/SettingsOverlayVeux/Android.bp
index 4c96e2f..cdd5955 100644
--- a/rro_overlays/SettingsOverlayVeux/Android.bp
+++ b/rro_overlays/SettingsOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "SettingsOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/SettingsOverlayVeux/AndroidManifest.xml b/rro_overlays/SettingsOverlayVeux/AndroidManifest.xml
index 61e91b9..477a038 100644
--- a/rro_overlays/SettingsOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/SettingsOverlayVeux/AndroidManifest.xml
@@ -12,9 +12,9 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settings.overlay.veux">
+
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.settings"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="com.android.settings"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/SettingsProviderOverlayVeux/Android.bp b/rro_overlays/SettingsProviderOverlayVeux/Android.bp
index 82a785a..46e6694 100644
--- a/rro_overlays/SettingsProviderOverlayVeux/Android.bp
+++ b/rro_overlays/SettingsProviderOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "SettingsProviderOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/SettingsProviderOverlayVeux/AndroidManifest.xml b/rro_overlays/SettingsProviderOverlayVeux/AndroidManifest.xml
index 91fdc2a..d3b6fea 100644
--- a/rro_overlays/SettingsProviderOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/SettingsProviderOverlayVeux/AndroidManifest.xml
@@ -11,10 +11,10 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settingsprovider.overlay.veux">
+    package="com.android.providers.settings.overlay.veux">
+
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.providers.settings"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="com.android.providers.settings"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/SettingsProviderOverlayVeux/res/values/defaults.xml b/rro_overlays/SettingsProviderOverlayVeux/res/values/defaults.xml
index c4d5084..8a8f470 100644
--- a/rro_overlays/SettingsProviderOverlayVeux/res/values/defaults.xml
+++ b/rro_overlays/SettingsProviderOverlayVeux/res/values/defaults.xml
@@ -27,5 +27,5 @@
 
     <!-- 15 seconds for default screen timeout -->
     <integer name="def_screen_off_timeout">30000</integer>
-
-</resources>
\ No newline at end of file
+    
+</resources>
diff --git a/rro_overlays/SystemUIOverlayVeux/Android.bp b/rro_overlays/SystemUIOverlayVeux/Android.bp
index d13373e..a700809 100644
--- a/rro_overlays/SystemUIOverlayVeux/Android.bp
+++ b/rro_overlays/SystemUIOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "SystemUIOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/SystemUIOverlayVeux/AndroidManifest.xml b/rro_overlays/SystemUIOverlayVeux/AndroidManifest.xml
index 5860249..0136a92 100644
--- a/rro_overlays/SystemUIOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/SystemUIOverlayVeux/AndroidManifest.xml
@@ -12,9 +12,9 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.systemui.overlay.veux">
+
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.systemui"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="com.android.systemui"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/TelephonyOverlayVeux/Android.bp b/rro_overlays/TelephonyOverlayVeux/Android.bp
index 8df4904..7d1a79c 100644
--- a/rro_overlays/TelephonyOverlayVeux/Android.bp
+++ b/rro_overlays/TelephonyOverlayVeux/Android.bp
@@ -17,6 +17,5 @@
 runtime_resource_overlay {
     name: "TelephonyOverlayVeux",
     sdk_version: "current",
-    resource_dirs: ["res"],
-    vendor: true,
+    product_specific: true
 }
diff --git a/rro_overlays/TelephonyOverlayVeux/AndroidManifest.xml b/rro_overlays/TelephonyOverlayVeux/AndroidManifest.xml
index 21d873e..ce0a7ac 100644
--- a/rro_overlays/TelephonyOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/TelephonyOverlayVeux/AndroidManifest.xml
@@ -11,10 +11,10 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.telephony.overlay.veux">
+    package="com.android.phone.overlay.veux">
+
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.phone"
-      android:isStatic="true"
-      android:priority="1"/>
+    <overlay android:targetPackage="com.android.phone"
+        android:isStatic="true"
+        android:priority="1"/>
 </manifest>
diff --git a/rro_overlays/TelephonyOverlayVeux/res/values/config.xml b/rro_overlays/TelephonyOverlayVeux/res/values/config.xml
index 5cd2e3e..f3eef84 100644
--- a/rro_overlays/TelephonyOverlayVeux/res/values/config.xml
+++ b/rro_overlays/TelephonyOverlayVeux/res/values/config.xml
@@ -32,4 +32,4 @@
     <!-- String indicating the package name of the device ImsService implementation for RCS. -->
     <string name="config_ims_rcs_package" translatable="false">org.codeaurora.ims</string>
     
-</resources>
\ No newline at end of file
+</resources>
diff --git a/rro_overlays/WifiOverlayVeux/AndroidManifest.xml b/rro_overlays/WifiOverlayVeux/AndroidManifest.xml
index 3065c54..a3b7bb8 100644
--- a/rro_overlays/WifiOverlayVeux/AndroidManifest.xml
+++ b/rro_overlays/WifiOverlayVeux/AndroidManifest.xml
@@ -13,13 +13,13 @@
 <!-- Pixel specific wifi overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     coreApp="true"
-    package="com.android.wifi.resources.veux"
+    package="com.android.wifi.resources.overlay.veux"
     android:versionCode="1"
     android:versionName="1.0">
+
     <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.wifi.resources"
-      android:targetName="WifiCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
+    <overlay android:targetPackage="com.android.wifi.resources"
+        android:targetName="WifiCustomization"
+        android:isStatic="true"
+        android:priority="0"/>
 </manifest>
-- 
cgit v1.2.3