From 0bc235e3ffc3eed564fb907416b633d3f6ce9005 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Fri, 31 Mar 2023 07:08:48 +0000 Subject: [PATCH 1/4] vendor: Rename overlays to match BlissLauncher --- config/common.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.mk b/config/common.mk index b2539becf..7b9b79aea 100644 --- a/config/common.mk +++ b/config/common.mk @@ -202,7 +202,7 @@ PRODUCT_PACKAGE_OVERLAYS += \ PRODUCT_PACKAGES += \ NetworkStackOverlay \ - TrebuchetOverlay + BlissLauncherOverlay # Translations PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/crowdin/overlay 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 @@ com.android.messaging com.google.android.setupwizard org.lineageos.setupwizard + foundation.e.blisslauncher 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 @@ com.android.dialer com.google.android.apps.messaging com.android.messaging + foundation.e.blisslauncher 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 --> + package="foundation.e.blisslauncher.overlay"> + android:targetPackage="foundation.e.blisslauncher" /> 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 f44944a18187a9f2fb27132b6ae5e22964ebc558 Mon Sep 17 00:00:00 2001 From: TheScarastic 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 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/common_mobile.mk b/config/common_mobile.mk index 74c8a5f02..ed6940f4b 100644 --- a/config/common_mobile.mk +++ b/config/common_mobile.mk @@ -47,6 +47,7 @@ endif # Customizations PRODUCT_PACKAGES += \ + 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 9a8ba05a6..156c49210 100644 --- a/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -81,8 +81,8 @@ com.google.android.gms - - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + + 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 - true + false false -- GitLab From cc7a149d8f9c8e499be95de0b66f6c664c4180e9 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Mon, 3 Apr 2023 12:19:33 +0000 Subject: [PATCH 3/4] overlay: Adjust package name for our calendar --- .../iconloaderlib/res/values/config.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml diff --git a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml new file mode 100644 index 000000000..16298140a --- /dev/null +++ b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml @@ -0,0 +1,24 @@ + + + + + foundation.e.calendar/com.android.calendar.AllInOneActivity + com.android.deskclock/com.android.deskclock.DeskClockApplication + + -- GitLab From 44e0077acde4eeac120334e9e316580011e25bde Mon Sep 17 00:00:00 2001 From: TheScarastic 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 984c43b02..7310f6aa9 100644 --- a/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml +++ b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml @@ -22,4 +22,7 @@ true + foundation.e.calendar/com.android.calendar.AllInOneActivity + com.android.deskclock/com.android.deskclock.DeskClockApplication + -- GitLab