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/bootanimation.tar b/bootanimation/bootanimation.tar index 7e4b0dc98e84e6dfe9dc6b843465ff25aae51ebc..60b99131f161a70b5f0fb2d9e646ce9da1fc8d1f 100644 Binary files a/bootanimation/bootanimation.tar and b/bootanimation/bootanimation.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/target/product/lineage_sdk_phone_x86.mk b/build/target/product/lineage_sdk_phone_x86.mk index 1ed2d2314cdd7a0eb81125430757762388d1e26c..0182a03de4aaf32e4bed191c2824526c801c3f45 100644 --- a/build/target/product/lineage_sdk_phone_x86.mk +++ b/build/target/product/lineage_sdk_phone_x86.mk @@ -21,7 +21,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed # Overrides PRODUCT_NAME := lineage_sdk_phone_x86 -PRODUCT_MODEL := LineageOS Android SDK built for x86 +PRODUCT_MODEL := /e/ os Android SDK built for x86 PRODUCT_SDK_ADDON_NAME := lineage PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := $(LOCAL_PATH)/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 183ee02da8f7127ce01f47481d51c5f9ca82005d..74e66cf1ad29b8f2fb92519251c3a5f064d5fc66 100644 --- a/build/target/product/lineage_sdk_phone_x86_64.mk +++ b/build/target/product/lineage_sdk_phone_x86_64.mk @@ -21,7 +21,7 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed # 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 4f8bedc9562f08d74f092b41963467e8a8ea627b..08936eb88b165cf0fe43f219c307bf0817b84870 100644 --- a/build/tasks/bacon.mk +++ b/build/tasks/bacon.mk @@ -16,7 +16,7 @@ # ----------------------------------------------------------------- # Lineage OTA update package -LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(LINEAGE_VERSION).zip +LINEAGE_TARGET_PACKAGE := $(PRODUCT_OUT)/e-$(LINEAGE_VERSION).zip SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py index 95958cc673760bc395a4e55def66a6f5ada920eb..f337b1c4d2b76685de95309b9f8d9e5ebfbc6f9a 100755 --- a/build/tools/roomservice.py +++ b/build/tools/roomservice.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # Copyright (C) 2012-2013, The CyanogenMod Project # (C) 2017-2018,2020-2021, The LineageOS Project +# (C) 2022, ECORP SAS # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +41,7 @@ except ImportError: from xml.etree import ElementTree product = sys.argv[1] +gitlab_api_url = "https://gitlab.e.foundation/api/v4" if len(sys.argv) > 2: depsonly = sys.argv[2] @@ -52,13 +54,12 @@ except: device = product if not depsonly: - print("Device %s not found. Attempting to retrieve device repository from LineageOS Github (http://github.com/LineageOS)." % device) + print("Device %s not found. Attempting to retrieve device repository from E FOUNDATION Gitlab (https://gitlab.e.foundation)." % device) repositories = [] try: authtuple = netrc.netrc().authenticators("api.github.com") - if authtuple: auth_string = ('%s:%s' % (authtuple[0], authtuple[2])).encode() githubauth = base64.encodestring(auth_string).decode().replace('\n', '') @@ -67,23 +68,38 @@ try: except: githubauth = None +def getRepos(): + global repos_from_e + repos_from_e = True + search_link = "{}/groups/230/projects?search=_{} device".format(gitlab_api_url, device) + search_link = search_link.replace(' ', '%20') + gitlabreq = urllib.request.Request(search_link) + try: + result = json.loads(urllib.request.urlopen(gitlabreq).read().decode()) + for res in result: + repositories.append(res) + except: + print("Failed to search Gitlab or could not parse return data from Gitlab") + repos_from_e = False + if not repositories: + print("Device %s not found in e. Attempting to retrieve device repository from LineageOS Github (http://github.com/LineageOS)." % device) + githubreq = urllib.request.Request("https://api.github.com/search/repositories?q=%s+user:LineageOS+in:name+fork:true" % device) + add_auth(githubreq) + try: + result = json.loads(urllib.request.urlopen(githubreq).read().decode()) + repos_from_e = False + except: + print("Failed to search GitHub or could not parse return data from GitHub") + sys.exit(1) + for res in result.get('items', []): + repositories.append(res) + def add_auth(githubreq): if githubauth: githubreq.add_header("Authorization","Basic %s" % githubauth) if not depsonly: - githubreq = urllib.request.Request("https://api.github.com/search/repositories?q=%s+user:LineageOS+in:name+fork:true" % device) - add_auth(githubreq) - try: - result = json.loads(urllib.request.urlopen(githubreq).read().decode()) - except urllib.error.URLError: - print("Failed to search GitHub") - sys.exit(1) - except ValueError: - print("Failed to parse return data from GitHub") - sys.exit(1) - for res in result.get('items', []): - repositories.append(res) + getRepos() local_manifests = r'.repo/local_manifests' if not os.path.exists(local_manifests): os.makedirs(local_manifests) @@ -127,6 +143,10 @@ def get_default_revision(): m = ElementTree.parse(get_manifest_path()) d = m.findall('default')[0] r = d.get('revision') + if repos_from_e: + for remote in m.findall('remote'): + if 'e' == remote.get('name'): + r = remote.get('revision') return r.replace('refs/heads/', '').replace('refs/tags/', '') def get_from_manifest(devicename): @@ -177,6 +197,18 @@ def is_in_manifest(projectpath): return False +def is_on_e(repository): + search_link = "{}/projects?search={}".format(gitlab_api_url, repository) + gitlabreq = urllib.request.Request(search_link) + try: + result = json.loads(urllib.request.urlopen(gitlabreq).read().decode()) + if result: + return True + except: + print("Failed to search Gitlab or could not parse return data from Gitlab") + return False + + def add_to_manifest(repositories, fallback_branch = None): try: lm = ElementTree.parse(".repo/local_manifests/roomservice.xml") @@ -189,12 +221,16 @@ def add_to_manifest(repositories, fallback_branch = None): repo_target = repository['target_path'] print('Checking if %s is fetched from %s' % (repo_target, repo_name)) if is_in_manifest(repo_target): - print('LineageOS/%s already fetched to %s' % (repo_name, repo_target)) + print('%s already fetched to %s' % (repo_name, repo_target)) continue - print('Adding dependency: LineageOS/%s -> %s' % (repo_name, repo_target)) - project = ElementTree.Element("project", attrib = { "path": repo_target, - "remote": "github", "name": "LineageOS/%s" % repo_name }) + print('Adding dependency: %s -> %s' % (repo_name, repo_target)) + if repos_from_e and is_on_e(repo_name): + project = ElementTree.Element("project", attrib = { "path": repo_target, + "remote": "e", "name": "e/devices/%s" % repo_name }) + else: + project = ElementTree.Element("project", attrib = { "path": repo_target, + "remote": "github", "name": "LineageOS/%s" % repo_name }) if 'branch' in repository: project.set('revision',repository['branch']) @@ -268,25 +304,29 @@ else: repo_name = repository['name'] if re.match(r"^android_device_[^_]*_" + device + "$", repo_name): print("Found repository: %s" % repository['name']) - manufacturer = repo_name.replace("android_device_", "").replace("_" + device, "") - default_revision = get_default_revision() print("Default revision: %s" % default_revision) print("Checking branch info") - githubreq = urllib.request.Request(repository['branches_url'].replace('{/branch}', '')) - add_auth(githubreq) - result = json.loads(urllib.request.urlopen(githubreq).read().decode()) + if repos_from_e: + gitlabreq = urllib.request.Request("{}/projects/{}/repository/branches?search={}".format(gitlab_api_url, repository['id'], default_revision)) + result = json.loads(urllib.request.urlopen(gitlabreq).read().decode()) + else: + githubreq = urllib.request.Request(repository['branches_url'].replace('{/branch}', '')) + add_auth(githubreq) + result = json.loads(urllib.request.urlopen(githubreq).read().decode()) ## Try tags, too, since that's what releases use if not has_branch(result, default_revision): - githubreq = urllib.request.Request(repository['tags_url'].replace('{/tag}', '')) - add_auth(githubreq) - result.extend (json.loads(urllib.request.urlopen(githubreq).read().decode())) - + if repos_from_e: + gitlabreq = urllib.request.Request("{}/projects/{}/repository/tags".format(gitlab_api_url, repository['id'])) + result.extend (json.loads(urllib.request.urlopen(gitlabreq).read().decode())) + else: + githubreq = urllib.request.Request(repository['tags_url'].replace('{/tag}', '')) + add_auth(githubreq) + result.extend (json.loads(urllib.request.urlopen(githubreq).read().decode())) repo_path = "device/%s/%s" % (manufacturer, device) adding = {'repository':repo_name,'target_path':repo_path} - fallback_branch = None if not has_branch(result, default_revision): if os.getenv('ROOMSERVICE_BRANCHES'): diff --git a/config/common.mk b/config/common.mk index d689a7ed78e64e33c516facbe57555346b2679de..b792944dc556f5cb8a27861672d3f251d7fb8c31 100644 --- a/config/common.mk +++ b/config/common.mk @@ -211,4 +211,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_mobile.mk b/config/common_mobile.mk index e55a04661acc93add4f4c8a2198c89af43ffe0e3..5897e15c3c921b12c88cbd6f8e00f03e23140b65 100644 --- a/config/common_mobile.mk +++ b/config/common_mobile.mk @@ -16,7 +16,7 @@ PRODUCT_PACKAGES += \ Profiles \ Seedvault -ifneq ($(TARGET_EXCLUDES_AUDIOFX),true) +ifeq ($(TARGET_INCLUDES_AUDIOFX),true) PRODUCT_PACKAGES += \ AudioFX endif @@ -63,3 +63,6 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ # SystemUI plugins PRODUCT_PACKAGES += \ QuickAccessWallet + +# 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 c7dc7957ac2db5cbb501bba44bab33fd9e537047..0000000000000000000000000000000000000000 --- a/config/partner_gms.mk +++ /dev/null @@ -1,43 +0,0 @@ -ifeq ($(WITH_GMS),true) - # Special handling for Android TV - ifeq ($(PRODUCT_IS_ATV),true) - 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, vendor/partner_gms-tv/products/gms.mk) - endif - $(call inherit-product, vendor/partner_gms-tv/products/mainline_modules.mk) - # Special handling for Android Automotive - else ifeq ($(PRODUCT_IS_AUTO),true) - ifneq ($(GMS_MAKEFILE),) - $(call inherit-product, vendor/partner_gms-car/products/$(GMS_MAKEFILE)) - else - $(call inherit-product, vendor/partner_gms-car/products/gms.mk) - endif - else - # 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 - - # 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 diff --git a/config/telephony.mk b/config/telephony.mk index 6adf48d90bb9a1932ba6f07023a5dc700459dea1..c2e3aebbe42580a0c78378335a23bf831c72bda1 100644 --- a/config/telephony.mk +++ b/config/telephony.mk @@ -19,3 +19,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # (for devices that check this) PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ net.tethering.noprovisioning=true + +# Include configuration for eos +$(call inherit-product, vendor/eos/config/telephony.mk) diff --git a/config/version.mk b/config/version.mk index 1f5045c9250a2ac1b9f8e965a824724d977efc89..f68bea246ae435439a4dd976e2cfe0af0c0346e7 100644 --- a/config/version.mk +++ b/config/version.mk @@ -1,5 +1,14 @@ -PRODUCT_VERSION_MAJOR = 19 -PRODUCT_VERSION_MINOR = 1 +ANDROID_LETTER := s +PRODUCT_VERSION_MAJOR = 1 +PRODUCT_VERSION_MINOR = 3 + +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 +27,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,$(LINEAGE_BUILDTYPE)),) LINEAGE_BUILDTYPE := UNOFFICIAL LINEAGE_EXTRAVERSION := endif @@ -29,10 +38,10 @@ 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) +LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(PRODUCT_PRERELEASE_STRING)-$(ANDROID_LETTER)-$(LINEAGE_VERSION_SUFFIX) # 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.jpg b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a4afdd1436c783da56e5425df98ebe2f8f886db6 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.jpg differ 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 deleted file mode 100644 index c38e6e0d3710e63ecbb42bdf0a481d59f53e5255..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-hdpi/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-large-notouch/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-large-notouch/default_wallpaper.png deleted file mode 100644 index 21b7d763b03983a8ee441df6eb2344a29f4a3c74..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-large-notouch/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a4afdd1436c783da56e5425df98ebe2f8f886db6 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg 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 deleted file mode 100644 index a60c013e77b7b874895d8893a2842220e821a367..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a4afdd1436c783da56e5425df98ebe2f8f886db6 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg 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 deleted file mode 100644 index 10b06e32db8b8879c9c4580a05e15e8d364277e9..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a4afdd1436c783da56e5425df98ebe2f8f886db6 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg 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 deleted file mode 100644 index 10b06e32db8b8879c9c4580a05e15e8d364277e9..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a4afdd1436c783da56e5425df98ebe2f8f886db6 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg 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 deleted file mode 100644 index 4134452c2f09a43de5cf0175e70a653ec80ff56e..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cb84af401d1b8c61a482292d58661db44714a591 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.jpg 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 deleted file mode 100644 index 10b06e32db8b8879c9c4580a05e15e8d364277e9..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxhdpi/default_wallpaper.png and /dev/null differ diff --git a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cb84af401d1b8c61a482292d58661db44714a591 Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.jpg 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 deleted file mode 100644 index 0eceece7d96e9453933cac839886ce8956f21ca3..0000000000000000000000000000000000000000 Binary files a/overlay/common/frameworks/base/core/res/res/drawable-xxxhdpi/default_wallpaper.png and /dev/null differ 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/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh index 992dbc9c7a800aa605d8786e2cc8a6d07d865937..42114aa649aa507bb120bc140b4df662d1374bfd 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=19.1 +export V=12 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 15e80ebe57c955a39f5bdd9d3c1c5d5e75a8ef4c..11947e97f8a46b7b656dd8247b27eabfd5ede1fd 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=19.1 +export V=12 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 9039103aaafe4dd98002318af33549ecc6c92de6..5b952b36c3353c1c9f6c725011ae867d0250a5d8 100644 --- a/prebuilt/common/etc/apns-conf.xml +++ b/prebuilt/common/etc/apns-conf.xml @@ -1058,6 +1058,7 @@ +