From 57e0688af043c6dc001d895d1e4c1fe919a605a1 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Fri, 31 Mar 2023 07:08:48 +0000
Subject: [PATCH 1/4] vendor: Rename overlays to match BlissLauncher

---
 config/common_mobile.mk                                       | 2 +-
 .../res/res/values/vendor_required_apps_managed_device.xml    | 1 +
 .../core/res/res/values/vendor_required_apps_managed_user.xml | 1 +
 .../{TrebuchetOverlay => BlissLauncherOverlay}/Android.bp     | 2 +-
 .../AndroidManifest.xml                                       | 4 ++--
 .../res/values/config.xml                                     | 0
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename overlay/rro_packages/{TrebuchetOverlay => BlissLauncherOverlay}/Android.bp (81%)
 rename overlay/rro_packages/{TrebuchetOverlay => BlissLauncherOverlay}/AndroidManifest.xml (72%)
 rename overlay/rro_packages/{TrebuchetOverlay => BlissLauncherOverlay}/res/values/config.xml (100%)

diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index eae41df8e..6e381bdb3 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -28,7 +28,7 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \
 endif
 
 PRODUCT_PACKAGES += \
-    TrebuchetOverlay
+    BlissLauncherOverlay
 
 # Charger
 PRODUCT_PACKAGES += \
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
index 37c5f13e5..56398aa87 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
@@ -34,5 +34,6 @@
         <item>com.android.messaging</item> <!-- AOSP messaging -->
         <item>com.google.android.setupwizard</item> <!-- Google SetupWizard -->
         <item>org.lineageos.setupwizard</item> <!-- LineageOS SetupWizard -->
+        <item>foundation.e.blisslauncher</item> <!--­ Bliss Launcher -->
     </string-array>
 </resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
index 0099c83bb..978a7f4e7 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
@@ -32,5 +32,6 @@
         <item>com.android.dialer</item> <!-- AOSP dialer -->
         <item>com.google.android.apps.messaging</item> <!-- Google messaging to enable text messaging -->
         <item>com.android.messaging</item> <!-- AOSP messaging -->
+        <item>foundation.e.blisslauncher</item> <!-- Bliss Launcher -->
     </string-array>
 </resources>
diff --git a/overlay/rro_packages/TrebuchetOverlay/Android.bp b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
similarity index 81%
rename from overlay/rro_packages/TrebuchetOverlay/Android.bp
rename to overlay/rro_packages/BlissLauncherOverlay/Android.bp
index 833e0d8f2..12cb08515 100644
--- a/overlay/rro_packages/TrebuchetOverlay/Android.bp
+++ b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "TrebuchetOverlay",
+    name: "BlissLauncherOverlay",
     product_specific: true,
 }
diff --git a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
similarity index 72%
rename from overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
rename to overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
index b87512af0..1f2b84651 100644
--- a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
@@ -4,10 +4,10 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3.overlay">
+    package="foundation.e.blisslauncher.overlay">
 
     <overlay
         android:isStatic="true"
         android:priority="100"
-        android:targetPackage="com.android.launcher3" />
+        android:targetPackage="foundation.e.blisslauncher" />
 </manifest>
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
similarity index 100%
rename from overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
rename to overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
-- 
GitLab


From 546680d1859c3ce98077d9c8a0c41dbaf9048607 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Fri, 31 Mar 2023 08:02:52 +0000
Subject: [PATCH 2/4] vendor: overlay: Changes default icon mask and roudned
 radius

 * Also build replacing overlay for circle
---
 config/common_mobile.mk                                     | 1 +
 .../common/frameworks/base/core/res/res/values/config.xml   | 6 +++---
 .../common/frameworks/base/core/res/res/values/dimens.xml   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 6e381bdb3..00b930028 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -66,6 +66,7 @@ PRODUCT_PACKAGES += \
     IconPackVictorLauncherOverlay \
     IconPackVictorSettingsOverlay \
     IconPackVictorSystemUIOverlay \
+    IconShapeCircleOverlay \
     IconShapePebbleOverlay \
     IconShapeRoundedRectOverlay \
     IconShapeSquareOverlay \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 3b5419be2..ace753fbd 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -80,8 +80,8 @@
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">4</integer>
 
-   <!-- Set icon mask to circle -->
-   <string name="config_icon_mask" translatable="false">"M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"</string>
+    <!-- Set icon mask to circle -->
+    <string name="config_icon_mask">M 78.9068 100.0425 H 21.0206 c -11.6647 0 -21.1077 -9.4484 -21.1077 -21.12 V 21.12 C 0.03 9.4484 9.473 0 21.1377 0 h 57.7688 c 11.6647 0 21.1077 9.4484 21.1077 21.12 v 57.8023 C 100.0146 90.5941 90.5719 100.0425 78.9068 100.0425 z</string>
 
     <!-- Whether action menu items should be displayed in ALLCAPS or not.
          Defaults to true. If this is not appropriate for specific locales
@@ -89,7 +89,7 @@
     <bool name="config_buttonTextAllCaps">false</bool>
 
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
-    <bool name="config_useRoundIcon">true</bool>
+    <bool name="config_useRoundIcon">false</bool>
 
     <!-- Whether or not we should show the option to show battery percentage -->
     <bool name="config_battery_percentage_setting_available">false</bool>
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimens.xml b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
index 614e69f03..c78bb7a35 100644
--- a/overlay/common/frameworks/base/core/res/res/values/dimens.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
@@ -17,11 +17,11 @@
 -->
 <resources>
     <!-- Corner radius of system dialogs -->
-    <dimen name="config_dialogCornerRadius">28dp</dimen>
+    <dimen name="config_dialogCornerRadius">4dp</dimen>
     <!-- Corner radius of system buttons -->
     <dimen name="config_buttonCornerRadius">4dp</dimen>
     <!-- Corner radius for bottom sheet system dialogs -->
-    <dimen name="config_bottomDialogCornerRadius">16dp</dimen>
+    <dimen name="config_bottomDialogCornerRadius">8dp</dimen>
     <!-- Corner radius of system progress bars -->
     <dimen name="config_progressBarCornerRadius">1000dp</dimen>
     <!-- System-provided radius for the background view of app widgets. The resolved value of this resource may change at runtime. -->
-- 
GitLab


From 98e756430d6ec17a16c46a1fda2398f235cad644 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Mon, 3 Apr 2023 12:19:33 +0000
Subject: [PATCH 3/4] overlay: Adjust package name for our calendar

---
 .../libs/systemui/iconloaderlib/res/values/config.xml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
index 0c3e41697..16298140a 100644
--- a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
+++ b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
@@ -18,7 +18,7 @@
 -->
 <resources>
 
-    <string name="calendar_component_name" translatable="false">org.lineageos.etar/com.android.calendar.AllInOneActivity</string>
+    <string name="calendar_component_name" translatable="false">foundation.e.calendar/com.android.calendar.AllInOneActivity</string>
     <string name="clock_component_name" translatable="false">com.android.deskclock/com.android.deskclock.DeskClockApplication</string>
 
 </resources>
-- 
GitLab


From bde083000627dbba051a0d3b17dfb2e5d0c6a1b2 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Tue, 4 Apr 2023 11:43:40 +0000
Subject: [PATCH 4/4] overlays: Also define package in rro

---
 .../rro_packages/BlissLauncherOverlay/res/values/config.xml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
index 401fc9d5e..285d09c4a 100644
--- a/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
@@ -19,4 +19,7 @@
     <!-- Default packages -->
     <string name="wallpaper_picker_package" translatable="false">com.android.wallpaper</string>
 
+    <string name="calendar_component_name" translatable="false">foundation.e.calendar/com.android.calendar.AllInOneActivity</string>
+    <string name="clock_component_name" translatable="false">com.android.deskclock/com.android.deskclock.DeskClockApplication</string>
+
 </resources>
-- 
GitLab