From b2482bb13599784583488b1fe183b4972e06537c Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Tue, 18 Apr 2023 14:14:45 +0300
Subject: [PATCH] overlay: Convert DocumentsUI RRO to standalone package

Fixes:
W idmap2d : overlay '/product/overlay/DocumentsUI__auto_generated_rro_product.apk' is not allowed to overlay resource 'bool/config_default_show_device_root' in target: <overlay> android:targetName "" does not match overlayable name "DocumentsUICustomization"
W idmap2d : failed to find resource 'bool/show_documents_root'
W idmap2d : overlay '/product/overlay/DocumentsUI__auto_generated_rro_product.apk' is not allowed to overlay resource 'string/default_root_uri' in target: <overlay> android:targetName "" does not match overlayable name "DocumentsUICustomization"
E idmap2d : no resources were overlaid

Remove unused overlays while we are at it.

Change-Id: Icf48bb9644bcfd2ca2c1c5681623f4f7c762bf35
---
 config/common.mk                              |  1 +
 .../apps/DocumentsUI/res/values/config.xml    | 27 -------------------
 .../DocumentsUIOverlay/Android.bp             |  9 +++++++
 .../DocumentsUIOverlay/AndroidManifest.xml    | 14 ++++++++++
 .../DocumentsUIOverlay/res/values/config.xml  | 10 +++++++
 5 files changed, 34 insertions(+), 27 deletions(-)
 delete mode 100644 overlay/common/packages/apps/DocumentsUI/res/values/config.xml
 create mode 100644 overlay/rro_packages/DocumentsUIOverlay/Android.bp
 create mode 100644 overlay/rro_packages/DocumentsUIOverlay/AndroidManifest.xml
 create mode 100644 overlay/rro_packages/DocumentsUIOverlay/res/values/config.xml

diff --git a/config/common.mk b/config/common.mk
index 7048c9cb..cdf67f6d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -200,6 +200,7 @@ PRODUCT_PACKAGE_OVERLAYS += \
     vendor/lineage/overlay/no-rro
 
 PRODUCT_PACKAGES += \
+    DocumentsUIOverlay \
     NetworkStackOverlay \
     TrebuchetOverlay
 
diff --git a/overlay/common/packages/apps/DocumentsUI/res/values/config.xml b/overlay/common/packages/apps/DocumentsUI/res/values/config.xml
deleted file mode 100644
index 3d40342e..00000000
--- a/overlay/common/packages/apps/DocumentsUI/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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>
-
-    <!-- Flags setup as productivity oriented in which case Downloads app will be presented
-             as Files app. Including showing of the Documents and "advanced" roots. -->
-    <bool name="show_documents_root">true</bool>
-
-    <!-- Indicates if internal storage is shown as default or not. -->
-    <bool name="config_default_show_device_root">true</bool>
-
-    <string name="default_root_uri" translatable="false">content://com.android.externalstorage.documents/root/primary</string>
-</resources>
diff --git a/overlay/rro_packages/DocumentsUIOverlay/Android.bp b/overlay/rro_packages/DocumentsUIOverlay/Android.bp
new file mode 100644
index 00000000..44345b94
--- /dev/null
+++ b/overlay/rro_packages/DocumentsUIOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2023 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "DocumentsUIOverlay",
+    product_specific: true,
+}
diff --git a/overlay/rro_packages/DocumentsUIOverlay/AndroidManifest.xml b/overlay/rro_packages/DocumentsUIOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..7f54fd3f
--- /dev/null
+++ b/overlay/rro_packages/DocumentsUIOverlay/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.documentsui.overlay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="100"
+        android:targetPackage="com.android.documentsui"
+        android:targetName="DocumentsUICustomization" />
+</manifest>
diff --git a/overlay/rro_packages/DocumentsUIOverlay/res/values/config.xml b/overlay/rro_packages/DocumentsUIOverlay/res/values/config.xml
new file mode 100644
index 00000000..a7556d6d
--- /dev/null
+++ b/overlay/rro_packages/DocumentsUIOverlay/res/values/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2023 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <string name="default_root_uri" translatable="false">content://com.android.externalstorage.documents/root/primary</string>
+
+</resources>