From aeadc6a3171a89936cc720dd5723fea16072c6a6 Mon Sep 17 00:00:00 2001
From: AdarshGrewal <adarshgrewal@gmail.com>
Date: Sun, 27 Jul 2025 16:31:16 +0530
Subject: [PATCH] vermeer: overlay: Move all SettingsProvider overlays to
 single dir

Change-Id: Idcd2c557edccc168d460a2e81922167d876f021d
---
 overlay/SettingsProviderResVermeer/Android.bp  | 18 ++++++++++++++++++
 .../AndroidManifest-POCO.xml}                  |  0
 .../AndroidManifest-Redmi.xml}                 |  0
 .../res-POCO}/values/defaults.xml              |  0
 .../res-Redmi}/values/defaults.xml             |  0
 .../SettingsProviderResVermeerPOCO/Android.bp  | 10 ----------
 .../SettingsProviderResVermeerRedmi/Android.bp | 10 ----------
 7 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 overlay/SettingsProviderResVermeer/Android.bp
 rename overlay/{SettingsProviderResVermeerPOCO/AndroidManifest.xml => SettingsProviderResVermeer/AndroidManifest-POCO.xml} (100%)
 rename overlay/{SettingsProviderResVermeerRedmi/AndroidManifest.xml => SettingsProviderResVermeer/AndroidManifest-Redmi.xml} (100%)
 rename overlay/{SettingsProviderResVermeerPOCO/res => SettingsProviderResVermeer/res-POCO}/values/defaults.xml (100%)
 rename overlay/{SettingsProviderResVermeerRedmi/res => SettingsProviderResVermeer/res-Redmi}/values/defaults.xml (100%)
 delete mode 100644 overlay/SettingsProviderResVermeerPOCO/Android.bp
 delete mode 100644 overlay/SettingsProviderResVermeerRedmi/Android.bp

diff --git a/overlay/SettingsProviderResVermeer/Android.bp b/overlay/SettingsProviderResVermeer/Android.bp
new file mode 100644
index 0000000..1c34aee
--- /dev/null
+++ b/overlay/SettingsProviderResVermeer/Android.bp
@@ -0,0 +1,18 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsProviderResVermeerPOCO",
+    manifest: "AndroidManifest-POCO.xml",
+    resource_dirs: ["res-POCO"],
+    vendor: true,
+}
+
+runtime_resource_overlay {
+    name: "SettingsProviderResVermeerRedmi",
+    manifest: "AndroidManifest-Redmi.xml",
+    resource_dirs: ["res-Redmi"],
+    vendor: true,
+}
diff --git a/overlay/SettingsProviderResVermeerPOCO/AndroidManifest.xml b/overlay/SettingsProviderResVermeer/AndroidManifest-POCO.xml
similarity index 100%
rename from overlay/SettingsProviderResVermeerPOCO/AndroidManifest.xml
rename to overlay/SettingsProviderResVermeer/AndroidManifest-POCO.xml
diff --git a/overlay/SettingsProviderResVermeerRedmi/AndroidManifest.xml b/overlay/SettingsProviderResVermeer/AndroidManifest-Redmi.xml
similarity index 100%
rename from overlay/SettingsProviderResVermeerRedmi/AndroidManifest.xml
rename to overlay/SettingsProviderResVermeer/AndroidManifest-Redmi.xml
diff --git a/overlay/SettingsProviderResVermeerPOCO/res/values/defaults.xml b/overlay/SettingsProviderResVermeer/res-POCO/values/defaults.xml
similarity index 100%
rename from overlay/SettingsProviderResVermeerPOCO/res/values/defaults.xml
rename to overlay/SettingsProviderResVermeer/res-POCO/values/defaults.xml
diff --git a/overlay/SettingsProviderResVermeerRedmi/res/values/defaults.xml b/overlay/SettingsProviderResVermeer/res-Redmi/values/defaults.xml
similarity index 100%
rename from overlay/SettingsProviderResVermeerRedmi/res/values/defaults.xml
rename to overlay/SettingsProviderResVermeer/res-Redmi/values/defaults.xml
diff --git a/overlay/SettingsProviderResVermeerPOCO/Android.bp b/overlay/SettingsProviderResVermeerPOCO/Android.bp
deleted file mode 100644
index 77828b9..0000000
--- a/overlay/SettingsProviderResVermeerPOCO/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "SettingsProviderResVermeerPOCO",
-    device_specific: true,
-}
diff --git a/overlay/SettingsProviderResVermeerRedmi/Android.bp b/overlay/SettingsProviderResVermeerRedmi/Android.bp
deleted file mode 100644
index acb8dd8..0000000
--- a/overlay/SettingsProviderResVermeerRedmi/Android.bp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright (C) 2025 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "SettingsProviderResVermeerRedmi",
-    device_specific: true,
-}