From e11cbf52057f22c06b31d7b911632d912c1b2032 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 13 Jan 2022 07:07:05 +0000
Subject: [PATCH 1/2] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..f01e77790
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,7 @@
+stages:
+  - update-from-upstream
+
+include:
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
-- 
GitLab


From 0f848ab73f0331b8d35e9b21e55cc92e05f96900 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Tue, 4 Apr 2023 11:21:27 +0000
Subject: [PATCH 2/2] ThemePicker: Adjust permission for changed packagename

Change-Id: If81882ee61b9bcc652ff3c73f2507867c3d5a5a0
---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a86d70abd..a6a354bb0 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,8 +43,8 @@
         </intent>
     </queries>
 
-    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
-    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="foundation.e.blisslauncher.permission.READ_SETTINGS" />
+    <uses-permission android:name="foundation.e.blisslauncher.permission.WRITE_SETTINGS" />
 
     <application
         tools:replace="android:icon,android:name"
-- 
GitLab