diff --git a/LICENSE b/LICENSE
index cdec959c8d679837df7ffb7bc79839189a661c38..dd240aca7aa468fa93939ba95ad422a477f2f121 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
Copyright 2011-15 The CyanogenMod Project
2017 The LineageOS Project
+ 2019-21 E FOUNDATION
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk
index 97948f38cdc61674309e6c4750e26cc574debbb8..2c2dde5a1b1b742ff995287a93ecd2c11c170ec1 100644
--- a/bootanimation/Android.mk
+++ b/bootanimation/Android.mk
@@ -15,27 +15,44 @@
# limitations under the License.
#
+ifeq ($(TARGET_USES_MURENA_BOOTANIMATION),true)
+BOOTANIMATION_TAR = bootanimation_murena.tar
+BOOTANIMATION_FPS := 30
+else
+BOOTANIMATION_TAR = bootanimation.tar
+BOOTANIMATION_FPS := 60
+endif
+
TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip
$(TARGET_GENERATED_BOOTANIMATION): INTERMEDIATES := $(call intermediates-dir-for,BOOTANIMATION,bootanimation)
$(TARGET_GENERATED_BOOTANIMATION): $(SOONG_ZIP)
@echo "Building bootanimation.zip"
@rm -rf $(dir $@)
@mkdir -p $(INTERMEDIATES)
- $(hide) tar xfp vendor/lineage/bootanimation/bootanimation.tar -C $(INTERMEDIATES)
+ $(hide) tar xfp vendor/lineage/bootanimation/$(BOOTANIMATION_TAR) -C $(INTERMEDIATES)
$(hide) if [ $(TARGET_SCREEN_HEIGHT) -lt $(TARGET_SCREEN_WIDTH) ]; then \
IMAGEWIDTH=$(TARGET_SCREEN_HEIGHT); \
else \
IMAGEWIDTH=$(TARGET_SCREEN_WIDTH); \
fi; \
IMAGESCALEWIDTH=$$IMAGEWIDTH; \
- IMAGESCALEHEIGHT=$$(expr $$IMAGESCALEWIDTH / 3); \
+ if [ "$(TARGET_USES_MURENA_BOOTANIMATION)" = "true" ]; then \
+ IMAGESCALEHEIGHT=$(TARGET_SCREEN_HEIGHT); \
+ else \
+ IMAGESCALEHEIGHT=$$(expr $$IMAGESCALEWIDTH / 3); \
+ fi; \
if [ "$(TARGET_BOOTANIMATION_HALF_RES)" = "true" ]; then \
IMAGEWIDTH="$$(expr "$$IMAGEWIDTH" / 2)"; \
fi; \
- IMAGEHEIGHT=$$(expr $$IMAGEWIDTH / 3); \
+ if [ "$(TARGET_USES_MURENA_BOOTANIMATION)" = "true" ]; then \
+ IMAGEHEIGHT=$(TARGET_SCREEN_HEIGHT); \
+ else \
+ IMAGEHEIGHT=$$(expr $$IMAGEWIDTH / 3); \
+ fi; \
RESOLUTION="$$IMAGEWIDTH"x"$$IMAGEHEIGHT"; \
prebuilts/tools-lineage/${HOST_OS}-x86/bin/mogrify -resize $$RESOLUTION -colors 256 $(INTERMEDIATES)/*/*.png; \
- echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT 60" > $(INTERMEDIATES)/desc.txt; \
+ BOOTANIMFPS=$(BOOTANIMATION_FPS); \
+ echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT $$BOOTANIMFPS" > $(INTERMEDIATES)/desc.txt; \
cat vendor/lineage/bootanimation/desc.txt >> $(INTERMEDIATES)/desc.txt
$(hide) $(SOONG_ZIP) -L 0 -o $@ -C $(INTERMEDIATES) -D $(INTERMEDIATES)
diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar
index 14d5606215d77b922ab9047fdf71e7d464bb1513..60b99131f161a70b5f0fb2d9e646ce9da1fc8d1f 100644
Binary files a/bootanimation/bootanimation.tar and b/bootanimation/bootanimation.tar differ
diff --git a/bootanimation/bootanimation_murena.tar b/bootanimation/bootanimation_murena.tar
new file mode 100644
index 0000000000000000000000000000000000000000..870d9a31e9a7aefa28a010fc4a6da43a6cd0b2c2
Binary files /dev/null and b/bootanimation/bootanimation_murena.tar differ
diff --git a/build/core/main_version.mk b/build/core/main_version.mk
index 28044e2c5d2c5d0c6a85a0101e9a28e7e5dde958..fa2807bd43c1b73b0ed27fb95445b5b431263ff5 100644
--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
@@ -10,7 +10,18 @@ ADDITIONAL_SYSTEM_PROPERTIES += \
ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
ro.modversion=$(LINEAGE_VERSION) \
- ro.lineagelegal.url=https://lineageos.org/legal
+ ro.lineagelegal.url=https://lineageos.org/legal \
+ ro.elegal.url=https://e.foundation/legal
+
+ifdef CI_PIPELINE_ID
+ ADDITIONAL_SYSTEM_PROPERTIES += \
+ ro.cm.build.pipeline.id=$(CI_PIPELINE_ID)
+endif
+
+ifdef CI_PIPELINE_IID
+ ADDITIONAL_SYSTEM_PROPERTIES += \
+ ro.cm.build.pipeline.iid=$(CI_PIPELINE_IID)
+endif
# LineageOS Platform Display Version
ADDITIONAL_SYSTEM_PROPERTIES += \
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 5899c9872d5e4aa4c82e12cfd11b2dbe2f3e2f64..b5e9649a04dfb7a4e408e4472dab833206ceefa3 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -98,6 +98,23 @@ camera_override_format_from_reserved {
},
}
+soong_config_module_type {
+ name: "camera_custom_scaler_configuration",
+ module_type: "cc_defaults",
+ config_namespace: "lineageGlobalVars",
+ value_variables: ["camera_custom_scaler_configuration"],
+ properties: ["cppflags"],
+}
+
+camera_custom_scaler_configuration {
+ name: "camera_custom_scaler_configuration_defaults",
+ soong_config_variables: {
+ camera_custom_scaler_configuration: {
+ cppflags: ["-DTARGET_CAMERA_CUSTOM_SCALER_CONFIGURATION=\"%s\""],
+ },
+ },
+}
+
soong_config_module_type {
name: "gralloc_10_usage_bits",
module_type: "cc_defaults",
@@ -305,6 +322,23 @@ egl_display_array {
},
}
+soong_config_module_type {
+ name: "force_render_engine_gen_textures",
+ module_type: "cc_defaults",
+ config_namespace: "lineageGlobalVars",
+ bool_variables: ["force_render_engine_gen_textures"],
+ properties: ["cppflags"],
+}
+
+force_render_engine_gen_textures {
+ name: "force_render_engine_gen_textures_defaults",
+ soong_config_variables: {
+ force_render_engine_gen_textures: {
+ cppflags: ["-DTARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES"],
+ },
+ },
+}
+
soong_config_module_type {
name: "health_charging_control",
module_type: "cc_defaults",
diff --git a/build/target/product/lineage_sdk_phone_arm64.mk b/build/target/product/lineage_sdk_phone_arm64.mk
index a1f5afa847eb1db221c37b4d231f7eceaa5f3c71..35a59cef874f1ce73d6aca8cf54a44a0de3c8cb4 100644
--- a/build/target/product/lineage_sdk_phone_arm64.mk
+++ b/build/target/product/lineage_sdk_phone_arm64.mk
@@ -23,9 +23,11 @@ PRODUCT_MODULE_BUILD_FROM_SOURCE := true
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+PRODUCT_MODULE_BUILD_FROM_SOURCE := true
+
# Overrides
PRODUCT_NAME := lineage_sdk_phone_arm64
-PRODUCT_MODEL := LineageOS Android SDK built for arm64
+PRODUCT_MODEL := /e/ os Android SDK built for arm64
PRODUCT_SDK_ADDON_NAME := lineage
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := vendor/lineage/build/target/product/source.properties
diff --git a/build/target/product/lineage_sdk_phone_x86_64.mk b/build/target/product/lineage_sdk_phone_x86_64.mk
index 59fe59d4b1caa170510ba5ee1ebc5305375db5dc..6d5176c39558f70138c4784c767b6df633c396ad 100644
--- a/build/target/product/lineage_sdk_phone_x86_64.mk
+++ b/build/target/product/lineage_sdk_phone_x86_64.mk
@@ -23,9 +23,11 @@ PRODUCT_MODULE_BUILD_FROM_SOURCE := true
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+PRODUCT_MODULE_BUILD_FROM_SOURCE := true
+
# Overrides
PRODUCT_NAME := lineage_sdk_phone_x86_64
-PRODUCT_MODEL := LineageOS Android SDK built for x86_64
+PRODUCT_MODEL := /e/ os Android SDK built for x86_64
PRODUCT_SDK_ADDON_NAME := lineage
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := $(LOCAL_PATH)/source.properties
diff --git a/build/tasks/bacon.mk b/build/tasks/bacon.mk
index 2b90f261f648156d4ca884fdbab5af56f00228f1..4e969592520a08e569d1f3731231548ca637c7f7 100644
--- a/build/tasks/bacon.mk
+++ b/build/tasks/bacon.mk
@@ -16,12 +16,14 @@
# -----------------------------------------------------------------
# Lineage OTA update package
-LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(LINEAGE_VERSION).zip
+LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/e-$(LINEAGE_VERSION).zip
+MD5 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/md5sum
SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum
.PHONY: bacon
bacon: $(DEFAULT_GOAL) $(INTERNAL_OTA_PACKAGE_TARGET)
$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(LINEAGE_TARGET_PACKAGE)
$(hide) $(SHA256) $(LINEAGE_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LINEAGE_TARGET_PACKAGE).sha256sum
+ $(hide) $(MD5) $(LINEAGE_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LINEAGE_TARGET_PACKAGE).md5sum
@echo "Package Complete: $(LINEAGE_TARGET_PACKAGE)" >&2
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 6a5b612a5a97fc3573f6e0ce9ac4e3fdad3a663e..5a22d72103233cbc97102b66035197f3fbf10fb8 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -32,6 +32,8 @@ SOONG_CONFIG_lineageGlobalVars += \
additional_gralloc_10_usage_bits \
bootloader_message_offset \
camera_override_format_from_reserved \
+ camera_custom_scaler_configuration \
+ force_render_engine_gen_textures \
gralloc_handle_has_custom_content_md_reserved_size \
gralloc_handle_has_reserved_size \
gralloc_handle_has_ubwcp_format \
@@ -70,6 +72,8 @@ endif
# Soong bool variables
SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED)
+SOONG_CONFIG_lineageGlobalVars_camera_custom_scaler_configuration := $(TARGET_CAMERA_CUSTOM_SCALER_CONFIGURATION)
+SOONG_CONFIG_lineageGlobalVars_force_render_engine_gen_textures := $(TARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES)
SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_custom_content_md_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE)
SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_reserved_size := $(TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE)
SOONG_CONFIG_lineageGlobalVars_gralloc_handle_has_ubwcp_format := $(TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT)
@@ -83,6 +87,7 @@ SOONG_CONFIG_lineageQcomVars_uses_pre_uplink_features_netmgrd := $(TARGET_USES_P
BOOTLOADER_MESSAGE_OFFSET ?= 0
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED ?= false
+TARGET_FORCE_RENDER_ENGINE_GEN_TEXTURES ?= false
TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE ?= false
TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE ?= false
TARGET_GRALLOC_HANDLE_HAS_UBWCP_FORMAT ?= false
diff --git a/config/common.mk b/config/common.mk
index ca58f4ad4c01d29bc569474cf4da8b0db102992f..b2446ead84606c5998371f0ff1b7afe3f1f16253 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -251,4 +251,6 @@ include vendor/lineage/config/version.mk
-include vendor/lineage-priv/keys/keys.mk
-include $(WORKSPACE)/build_env/image-auto-bits.mk
--include vendor/lineage/config/partner_gms.mk
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/common.mk)
diff --git a/config/common_full.mk b/config/common_full.mk
index f7eecd848f96f90c0fb396ef50bb40df7c58903a..54f3efcb98f43b1e1a2672afefd5658beff668b8 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -20,7 +20,7 @@ PRODUCT_PACKAGES += \
Aperture
endif
-ifneq ($(TARGET_EXCLUDES_AUDIOFX),true)
+ifeq ($(TARGET_INCLUDES_AUDIOFX),true)
PRODUCT_PACKAGES += \
AudioFX
endif
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 4e898b4be91eac4b22c661fec25b0d6851618ce2..0dbd55fd6771e71925431b6cda7cb4fcd0084a05 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -8,11 +8,6 @@ include vendor/lineage/config/aosp_audio.mk
# Include Lineage audio files
include vendor/lineage/config/lineage_audio.mk
-# Default notification/alarm sounds
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.config.notification_sound=Argon.ogg \
- ro.config.alarm_alert=Hassium.ogg
-
# Apps
PRODUCT_PACKAGES += \
Backgrounds \
@@ -33,7 +28,7 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \
endif
PRODUCT_PACKAGES += \
- TrebuchetOverlay
+ BlissLauncherOverlay
# Charger
PRODUCT_PACKAGES += \
@@ -71,6 +66,7 @@ PRODUCT_PACKAGES += \
IconPackVictorLauncherOverlay \
IconPackVictorSettingsOverlay \
IconPackVictorSystemUIOverlay \
+ IconShapeCircleOverlay \
IconShapePebbleOverlay \
IconShapeRoundedRectOverlay \
IconShapeSquareOverlay \
@@ -94,3 +90,6 @@ PRODUCT_PACKAGES += \
LineageBlackTheme \
ThemePicker \
ThemesStub
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/common_mobile.mk)
diff --git a/config/partner_gms.mk b/config/partner_gms.mk
deleted file mode 100644
index e754da30d40afda12492bdb0dd54db9929db4f8c..0000000000000000000000000000000000000000
--- a/config/partner_gms.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-ifeq ($(WITH_GMS),true)
- # Special handling for Android TV
- ifeq ($(PRODUCT_IS_ATV),true)
- ifneq (,$(wildcard vendor/partner_gms-tv))
- ifneq ($(GMS_MAKEFILE),)
- # Specify the GMS makefile you want to use, for example:
- # - gms.mk - default Android TV GMS
- # - gms_gtv.mk - default Google TV GMS
- # - gms_minimal.mk - minimal Android TV GMS
- $(call inherit-product, vendor/partner_gms-tv/products/$(GMS_MAKEFILE))
- else
- $(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk)
- endif
- $(call inherit-product-if-exists, vendor/partner_gms-tv/products/mainline_modules.mk)
- endif
- # Special handling for Android Automotive
- else ifeq ($(PRODUCT_IS_AUTOMOTIVE),true)
- ifneq (,$(wildcard vendor/partner_gms-car))
- ifneq ($(GMS_MAKEFILE),)
- $(call inherit-product, vendor/partner_gms-car/products/$(GMS_MAKEFILE))
- else
- $(call inherit-product-if-exists, vendor/partner_gms-car/products/gms.mk)
- endif
- endif
- else
- ifneq (,$(wildcard vendor/partner_gms))
- # Specify the GMS makefile you want to use, for example:
- # - fi.mk - Project Fi
- # - gms.mk - default GMS
- # - gms_go.mk - low ram devices
- # - gms_go_2gb.mk - low ram devices (2GB)
- # - gms_64bit_only.mk - devices supporting 64-bit only
- # - gms_minimal.mk - minimal GMS
- ifneq ($(GMS_MAKEFILE),)
- $(call inherit-product, vendor/partner_gms/products/$(GMS_MAKEFILE))
- else
- $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
- endif
- endif
-
- ifneq (,$(wildcard vendor/partner_modules))
- # Specify the mainline module makefile you want to use, for example:
- # - mainline_modules.mk - updatable apex
- # - mainline_modules_flatten_apex.mk - flatten apex
- # - mainline_modules_low_ram.mk - low ram devices
- ifneq ($(MAINLINE_MODULES_MAKEFILE),)
- $(call inherit-product, vendor/partner_modules/build/$(MAINLINE_MODULES_MAKEFILE))
- endif
- endif
- endif
-endif
diff --git a/config/telephony.mk b/config/telephony.mk
index 0c6ebba88de3311046181caa58b872e5d41c8502..b153a1ef512e0ea9c81c8cbb72619ab5103b0616 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -16,10 +16,6 @@ PRODUCT_PACKAGES += \
messaging \
Stk
-# Default ringtone
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.config.ringtone=Orion.ogg
-
# Tethering - allow without requiring a provisioning app
# (for devices that check this)
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -28,3 +24,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
# Disable mobile data by default
PRODUCT_PRODUCT_PROPERTIES += \
ro.com.android.mobiledata=false
+
+# Include configuration for eos
+$(call inherit-product, vendor/eos/config/telephony.mk)
diff --git a/config/version.mk b/config/version.mk
index 9fb74174fee73932725dbd29348fa34b4f2eaa80..03e09d5980814459a3d02f15efd41778d8fbfd9b 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,5 +1,16 @@
-PRODUCT_VERSION_MAJOR = 21
-PRODUCT_VERSION_MINOR = 0
+ANDROID_LETTER := u
+PRODUCT_VERSION_MAJOR = 2
+PRODUCT_VERSION_MINOR = 2
+PRODUCT_VERSION_MAINTENANCE := 0
+PRODUCT_PRERELEASE_STRING = ""
+
+ifdef PRODUCT_PRERELEASE
+ ifdef PRODUCT_PRERELEASE_VERSION
+ PRODUCT_PRERELEASE_STRING = -$(PRODUCT_PRERELEASE).$(PRODUCT_PRERELEASE_VERSION)
+ else
+ PRODUCT_PRERELEASE_STRING = -$(PRODUCT_PRERELEASE)
+ endif
+endif
ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d_%H%M%S)
@@ -18,7 +29,7 @@ ifndef LINEAGE_BUILDTYPE
endif
# Filter out random types, so it'll reset to UNOFFICIAL
-ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(LINEAGE_BUILDTYPE)),)
+ifeq ($(filter test dev stable partner,$(LINEAGE_BUILDTYPE)),)
LINEAGE_BUILDTYPE := UNOFFICIAL
LINEAGE_EXTRAVERSION :=
endif
@@ -29,10 +40,14 @@ ifeq ($(LINEAGE_BUILDTYPE), UNOFFICIAL)
endif
endif
-LINEAGE_VERSION_SUFFIX := $(LINEAGE_BUILD_DATE)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
+LINEAGE_VERSION_SUFFIX := $(LINEAGE_BUILD_DATE)$(CI_PIPELINE_ID)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
# Internal version
-LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_VERSION_SUFFIX)
+ifeq ($(PRODUCT_VERSION_MAINTENANCE),0)
+ LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX)
+else
+ LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX)
+endif
# Display version
-LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR)-$(LINEAGE_VERSION_SUFFIX)
+LINEAGE_DISPLAY_VERSION := $(LINEAGE_VERSION)
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png
index c38e6e0d3710e63ecbb42bdf0a481d59f53e5255..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
index a60c013e77b7b874895d8893a2842220e821a367..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png
index 4134452c2f09a43de5cf0175e70a653ec80ff56e..62216628de95c525e02cd0c0e06d0f6a114587a1 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png
index 10b06e32db8b8879c9c4580a05e15e8d364277e9..da284b8161ea294c22713312d8dc6451d725c5c8 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png
index 0eceece7d96e9453933cac839886ce8956f21ca3..da284b8161ea294c22713312d8dc6451d725c5c8 100644
Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png and b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png differ
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 b1e1612b6437c352371579de7dda983ac59f9459..0cef763ee022795d5d4bb0f9eec2c4d08e77d43c 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -38,8 +38,6 @@
- com.google.android.gms
- com.android.location.fused
-
- - org.microg.nlp
@@ -53,6 +51,9 @@
- com.shannon.imsservice
- com.mediatek.ims
+
+ - org.microg.nlp.backend.ichnaea
+ - org.microg.nlp.backend.nominatim
@@ -77,8 +78,8 @@
4
-
- "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
@@ -146,14 +147,6 @@
true
-
- 2
-
true
@@ -172,6 +165,9 @@
should also be non-empty.-->
com.android.contacts
+
+ foundation.e.camera/net.sourceforge.opencamera.qr.QrScannerActivity
+
diff --git a/overlay/common/frameworks/base/core/res/res/values/dimens.xml b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c78bb7a35abcec6022621ab13bb07ca4aabaa35c
--- /dev/null
+++ b/overlay/common/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ 4dp
+
+ 4dp
+
+ 8dp
+
+ 1000dp
+
+ 28dp
+
+ 20dp
+
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 37c5f13e501d9ca536051e850a20bceb5a7ea3d8..56398aa873878f7353714f0812568d0055f0081a 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 0099c83bb5a9375ac8debb23af8e09ae39720fc9..978a7f4e71688c3f5c7dca7b0baf97340f437494 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/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
index 0c3e41697c1a0577040b037b65830ea7627f6872..16298140a7622344072345b9ff29c83bf76e53b5 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 @@
-->
- org.lineageos.etar/com.android.calendar.AllInOneActivity
+ foundation.e.calendar/com.android.calendar.AllInOneActivity
com.android.deskclock/com.android.deskclock.DeskClockApplication
diff --git a/overlay/common/packages/apps/Settings/res/values/strings.xml b/overlay/common/packages/apps/Settings/res/values/strings.xml
deleted file mode 100644
index 93758ea376e05ff2bcdaa82d6adec11150f04204..0000000000000000000000000000000000000000
--- a/overlay/common/packages/apps/Settings/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- https://support.google.com/wallet/answer/1347934
-
-
- https://support.google.com
-
-
diff --git a/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml b/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
index c2da4efb44d0c985a46ffc08250d6627e144d974..7b35cdedb710a5ff0b8f18da2c43d163d12fc3df 100644
--- a/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
+++ b/overlay/common/packages/apps/SimpleDeviceConfig/res/values/config.xml
@@ -50,5 +50,8 @@
- attention_manager_service/keep_screen_on_enabled=false
+
+
+ - window_manager/splash_screen_exception_list=foundation.e.accountmanager,foundation.e.pwaplayer
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 833e0d8f2c2352a6502e28eb8b3bb95cf56c58a4..12cb08515c879f78546324e9e3c62fa9a7c27ead 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 b87512af0772a2d5013cba64bda11985ea6cc0a1..1f2b84651890caa61f8efd230a994cefc29b2c06 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 75%
rename from overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
rename to overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
index 401fc9d5e1cee1684648d3d711ce42e37f5a1a46..285d09c4ae79f80ab6fb536b69a73d9c0b72a4a9 100644
--- a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
@@ -19,4 +19,7 @@
com.android.wallpaper
+ foundation.e.calendar/com.android.calendar.AllInOneActivity
+ com.android.deskclock/com.android.deskclock.DeskClockApplication
+
diff --git a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
index aef5c9ca1131053143bd6c7ceb926d4f4350b972..26c8e2cdb8cc765b9ce7b21b5350ec12c54348c1 100644
--- a/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
+++ b/overlay/rro_packages/NetworkStackOverlay/res/values/config.xml
@@ -19,4 +19,16 @@
true
+
+ http://connectivity.murena.io
+
+
+ https://connectivity.murena.io
+
+
+
+ - http://204.murena.io
+ - http://murena.io/generate_204
+
+
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 98156b69e4075f7da0e31a4dfa01502b4e235a61..fde8db5d954a83e600a3bd3a77671015cc5592fa 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -6,7 +6,7 @@
export C=/tmp/backupdir
export SYSDEV="$(readlink -nf "$2")"
export SYSFS="$3"
-export V=21.0
+export V=14
export ADDOND_VERSION=3
@@ -47,7 +47,7 @@ if [ ! -r $S/build.prop ]; then
echo "Backup/restore is not possible. Partition is probably empty"
return 1
fi
-if ! grep -q "^ro.lineage.version=$V.*" $S/build.prop; then
+if ! grep -q "^ro.build.version.release=$V.*" $S/build.prop; then
echo "Backup/restore is not possible. Incompatible ROM version: $V"
return 2
fi
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 140efeb8c92fff18b4af108f510a36afc8100392..f651bd8f55a6ce75dfe7381ae48d4f10407ec8a4 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -5,7 +5,7 @@
export S=/system
export C=/postinstall/tmp/backupdir
-export V=21.0
+export V=14
export ADDOND_VERSION=3
@@ -56,7 +56,7 @@ if [ ! -r /system/build.prop ]; then
echo "Backup/restore is not possible. Partition is probably empty"
return 1
fi
-if ! grep -q "^ro.lineage.version=$V.*" /system/build.prop; then
+if ! grep -q "^ro.build.version.release=$V.*" /system/build.prop; then
echo "Backup/restore is not possible. Incompatible ROM version: $V"
return 2
fi
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 1c97fa6e7e2ed07ebf2d4011b8e9ef8a4e39d29a..661cf90ef96ec572e0b058d9ee9aed8f423635b3 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -182,9 +182,13 @@
+
-
+
+
+
+
@@ -201,25 +205,25 @@
-
-
-
+
+
+
-
+
@@ -1054,6 +1058,7 @@
+