From ec6163d34c20c761fe7ccfb73e70b4e1e6681423 Mon Sep 17 00:00:00 2001
From: iovxw <iovxw@outlook.com>
Date: Tue, 26 Sep 2023 23:55:14 +0800
Subject: [PATCH 1/2] overlay: Add SystemUI overlay

---
 device.mk                                       | 3 ++-
 overlay/GsiSystemUITarget/Android.bp            | 5 +++++
 overlay/GsiSystemUITarget/AndroidManifest.xml   | 8 ++++++++
 overlay/GsiSystemUITarget/res/values/config.xml | 3 +++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 overlay/GsiSystemUITarget/Android.bp
 create mode 100644 overlay/GsiSystemUITarget/AndroidManifest.xml
 create mode 100644 overlay/GsiSystemUITarget/res/values/config.xml

diff --git a/device.mk b/device.mk
index 80350e2..a0348ea 100644
--- a/device.mk
+++ b/device.mk
@@ -29,7 +29,8 @@ SELINUX_IGNORE_NEVERALLOWS := true
 # Overlay
 PRODUCT_PACKAGES += \
     GsiFrameworkResTarget \
-    GsiLauncher3Target
+    GsiLauncher3Target \
+    GsiSystemUITarget
 
 # Device-specific overlays from phhusson
 include vendor/hardware_overlay/overlay.mk
diff --git a/overlay/GsiSystemUITarget/Android.bp b/overlay/GsiSystemUITarget/Android.bp
new file mode 100644
index 0000000..d2ed3f6
--- /dev/null
+++ b/overlay/GsiSystemUITarget/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+    name: "GsiSystemUITarget",
+    sdk_version: "current",
+    product_specific: true,
+}
diff --git a/overlay/GsiSystemUITarget/AndroidManifest.xml b/overlay/GsiSystemUITarget/AndroidManifest.xml
new file mode 100644
index 0000000..11842d0
--- /dev/null
+++ b/overlay/GsiSystemUITarget/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.systemui.overlay.gsi.target">
+    <overlay
+        android:isStatic="true"
+        android:priority="350"
+        android:targetPackage="com.android.systemui" />
+</manifest>
diff --git a/overlay/GsiSystemUITarget/res/values/config.xml b/overlay/GsiSystemUITarget/res/values/config.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/overlay/GsiSystemUITarget/res/values/config.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>

From f51d32b37d208bc4c3c02b7f16900179cb97564f Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 22 Jun 2023 15:17:51 +0200
Subject: [PATCH 2/2] overlay: Set screenshot work profile files app to
 DocumentsUI

Fixes NPE when taking a screenshot in work profile.

Change-Id: I73349b168543072be009b41bc2f3711876a10df2
---
 overlay/GsiSystemUITarget/res/values/config.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/overlay/GsiSystemUITarget/res/values/config.xml b/overlay/GsiSystemUITarget/res/values/config.xml
index 045e125..57425cd 100644
--- a/overlay/GsiSystemUITarget/res/values/config.xml
+++ b/overlay/GsiSystemUITarget/res/values/config.xml
@@ -1,3 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- ComponentName for the file browsing app that the system would expect to be used in work
+         profile. The icon for this app will be shown to the user when informing them that a
+         screenshot has been saved to work profile. If blank, a default icon will be shown. -->
+    <string name="config_sceenshotWorkProfileFilesApp" translatable="false">com.android.documentsui/.files.LauncherActivity</string>
 </resources>