From 80f5e763ff4e73cdebe94f2ace8b2492993af3a7 Mon Sep 17 00:00:00 2001
From: mNik033 <nktps40@gmail.com>
Date: Thu, 5 Aug 2021 12:44:18 +0530
Subject: [PATCH] DRG_sprout: move some overlays to rro_overlays workaround for
 some overlays not having effect

---
 device.mk                                             |  3 +++
 rro_overlays/CarrierConfigOverlay/Android.bp          |  7 +++++++
 rro_overlays/CarrierConfigOverlay/AndroidManifest.xml | 11 +++++++++++
 .../CarrierConfigOverlay}/res/xml/vendor.xml          |  0
 rro_overlays/FrameworkOverlay/Android.bp              |  7 +++++++
 rro_overlays/FrameworkOverlay/AndroidManifest.xml     | 11 +++++++++++
 .../FrameworkOverlay}/res/values/config.xml           |  0
 .../FrameworkOverlay}/res/values/strings.xml          |  0
 .../FrameworkOverlay}/res/xml/power_profile.xml       |  0
 rro_overlays/SystemUIOverlay/Android.bp               |  7 +++++++
 rro_overlays/SystemUIOverlay/AndroidManifest.xml      | 11 +++++++++++
 .../SystemUIOverlay}/res/values-sw372dp/dimens.xml    |  0
 .../SystemUIOverlay}/res/values/config.xml            |  0
 .../SystemUIOverlay}/res/values/dimens.xml            |  2 ++
 14 files changed, 59 insertions(+)
 create mode 100644 rro_overlays/CarrierConfigOverlay/Android.bp
 create mode 100644 rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
 rename {overlay/packages/apps/CarrierConfig => rro_overlays/CarrierConfigOverlay}/res/xml/vendor.xml (100%)
 create mode 100644 rro_overlays/FrameworkOverlay/Android.bp
 create mode 100644 rro_overlays/FrameworkOverlay/AndroidManifest.xml
 rename {overlay/frameworks/base/core/res => rro_overlays/FrameworkOverlay}/res/values/config.xml (100%)
 mode change 100755 => 100644
 rename {overlay/frameworks/base/core/res => rro_overlays/FrameworkOverlay}/res/values/strings.xml (100%)
 rename {overlay/frameworks/base/core/res => rro_overlays/FrameworkOverlay}/res/xml/power_profile.xml (100%)
 create mode 100644 rro_overlays/SystemUIOverlay/Android.bp
 create mode 100644 rro_overlays/SystemUIOverlay/AndroidManifest.xml
 rename {overlay/frameworks/base/packages/SystemUI => rro_overlays/SystemUIOverlay}/res/values-sw372dp/dimens.xml (100%)
 rename {overlay/frameworks/base/packages/SystemUI => rro_overlays/SystemUIOverlay}/res/values/config.xml (100%)
 rename {overlay/frameworks/base/packages/SystemUI => rro_overlays/SystemUIOverlay}/res/values/dimens.xml (96%)

diff --git a/device.mk b/device.mk
index dbeaa21..83678e5 100644
--- a/device.mk
+++ b/device.mk
@@ -442,9 +442,12 @@ PRODUCT_PACKAGES += \
 # Wi-Fi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
+    CarrierConfigOverlay \
+    FrameworkOverlay \
     libwpa_client \
     hostapd \
     TetheringConfigOverlay \
+    SystemUIOverlay \
     wpa_supplicant \
     wpa_supplicant.conf
 
diff --git a/rro_overlays/CarrierConfigOverlay/Android.bp b/rro_overlays/CarrierConfigOverlay/Android.bp
new file mode 100644
index 0000000..2dbdc6c
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/Android.bp
@@ -0,0 +1,7 @@
+runtime_resource_overlay {
+    name: "CarrierConfigOverlay",
+    theme: "CarrierConfigOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..545dbe6
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.drgcarrierconfigoverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.carrierconfig"
+      android:targetName="CarrierConfig"
+      android:isStatic="true"
+      android:priority="50"/>
+</manifest>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
similarity index 100%
rename from overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
rename to rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
diff --git a/rro_overlays/FrameworkOverlay/Android.bp b/rro_overlays/FrameworkOverlay/Android.bp
new file mode 100644
index 0000000..7d2aeed
--- /dev/null
+++ b/rro_overlays/FrameworkOverlay/Android.bp
@@ -0,0 +1,7 @@
+runtime_resource_overlay {
+    name: "FrameworkOverlay",
+    theme: "FrameworkOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/FrameworkOverlay/AndroidManifest.xml b/rro_overlays/FrameworkOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5cd37a4
--- /dev/null
+++ b/rro_overlays/FrameworkOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.drgframeworkoverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="android"
+      android:targetName="framework"
+      android:isStatic="true"
+      android:priority="50"/>
+</manifest>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlays/FrameworkOverlay/res/values/config.xml
old mode 100755
new mode 100644
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to rro_overlays/FrameworkOverlay/res/values/config.xml
diff --git a/overlay/frameworks/base/core/res/res/values/strings.xml b/rro_overlays/FrameworkOverlay/res/values/strings.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/strings.xml
rename to rro_overlays/FrameworkOverlay/res/values/strings.xml
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/rro_overlays/FrameworkOverlay/res/xml/power_profile.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/xml/power_profile.xml
rename to rro_overlays/FrameworkOverlay/res/xml/power_profile.xml
diff --git a/rro_overlays/SystemUIOverlay/Android.bp b/rro_overlays/SystemUIOverlay/Android.bp
new file mode 100644
index 0000000..e86e08f
--- /dev/null
+++ b/rro_overlays/SystemUIOverlay/Android.bp
@@ -0,0 +1,7 @@
+runtime_resource_overlay {
+    name: "SystemUIOverlay",
+    theme: "SystemUIOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/SystemUIOverlay/AndroidManifest.xml b/rro_overlays/SystemUIOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..a3994c7
--- /dev/null
+++ b/rro_overlays/SystemUIOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.drgsystemuioverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.systemui"
+      android:targetName="SystemUI"
+      android:isStatic="true"
+      android:priority="50"/>
+</manifest>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml b/rro_overlays/SystemUIOverlay/res/values-sw372dp/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
rename to rro_overlays/SystemUIOverlay/res/values-sw372dp/dimens.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/rro_overlays/SystemUIOverlay/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/config.xml
rename to rro_overlays/SystemUIOverlay/res/values/config.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/rro_overlays/SystemUIOverlay/res/values/dimens.xml
similarity index 96%
rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
rename to rro_overlays/SystemUIOverlay/res/values/dimens.xml
index 86cd431..dc79c8e 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/rro_overlays/SystemUIOverlay/res/values/dimens.xml
@@ -29,5 +29,7 @@
  
     <!-- Margin on the right side of the system icon group on Keyguard. -->
     <dimen name="system_icons_keyguard_padding_end">12dp</dimen>
+	
+	<dimen name="rounded_corner_radius">8dp</dimen>
 
 </resources>