diff --git a/.gitignore b/.gitignore
index 5b0717f1..a04d6c79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
proprietary/*
prebuilt/common/apps/
+prebuilt/archive
*~
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index de9967ff..1fb915b5 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -172,12 +172,12 @@ Galaxy Note 2 (N7100):
* Sensors working
* Camera working (back)
-CyanogenMod
+LineageOS
===============
-Visit http://github.com/CyanogenMod for full source and git access.
+Visit http://github.com/LineageOS for full source and git access.
-Visit http://review.cyanogenmod.org for our Gerrit instance.
+Visit http://review.lineageos.org for our Gerrit instance.
CHANGELOG (notable new features)
---------
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index ac9125f7..c0824494 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -3,15 +3,16 @@ Replicant
A non-exhaustive list of people involved in Replicant is available at: http://redmine.replicant.us/projects/replicant/wiki/People
-CyanogenMod
+LineageOS
===========
-Maintainers (CyanogenMod 13.0):
+Maintainers (LineageOS 13.0):
-----------------------------
* __Acer A700:__ pawitp
* __Alcatel Idol 3:__ c457
* __Amazon Kindle Fire 1st Edition:__ Hashcode, FuZZ__
* __Amazon Kindle Fire 2nd Edition:__ Hashcode, FuZZ__
+* __ARK Benefit A3 (peach):__ lolmaxlik
* __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens
* __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens
* __Asus EeePad Transformer Pad TF300T:__ chrmhoffmann
@@ -58,6 +59,7 @@ Maintainers (CyanogenMod 13.0):
* __HTC One XL:__ h8rift, intervigil, jrior001
* __Huawei Ascend Mate 2:__ mdmower, u-ra
* __Huawei Honor 4/4X (cherry):__ dianlujitao, surdupetru, desalesouche
+* __LeEco Le 2 (s2):__ codeworkx
* __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2
* __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2
* __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2
@@ -80,7 +82,6 @@ Maintainers (CyanogenMod 13.0):
* __LG Optimus L90:__ Quarx2k, vm03, NikitaProAndroid
* __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee
* __LG Optimus LTE (SK Telecom) (SU640):__ arcee
-* __LG V10 (T-Mobile) (H901):__ genesixxbf3
* __Moto E 2014 (xt1021,xt1022,xt1023/condor):__
* __Moto G 2014 (xt1063,xt1064,xt1068,xt1069/titan):__ LuK1337, luca020400
* __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil
diff --git a/LICENSE b/LICENSE
index 69f49a5e..cdec959c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
Copyright 2011-15 The CyanogenMod Project
+ 2017 The LineageOS Project
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/README.mkdn b/README.mkdn
index 9eff1ec1..de9b69bb 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -19,12 +19,12 @@ Copying
Replicant is made of free software, owned by various copyright holders and released under various free software licenses.
Please refer to the source code of each component for specific details.
-CyanogenMod
+LineageOS
===========
Submitting Patches
------------------
-Patches are always welcome! Please submit your patches via CyanogenMod Gerrit!
+Patches are always welcome! Please submit your patches via LineageOS Gerrit!
You can do this by using these commands:
(From root android directory)
@@ -41,31 +41,31 @@ For more help on using this tool, use this command: repo help upload
Make your changes and commit with a detailed message, starting with what you are working with (i.e. vision: Update Kernel)
Commit your patches in a single commit. Squash multiple commit using this command: git rebase -i HEAD~<# of commits>
-To view the status of your and others' patches, visit [CyanogenMod Code Review](http://review.cyanogenmod.org/)
+To view the status of your and others' patches, visit [LineageOS Code Review](http://review.lineageos.org/)
Getting Started
---------------
-To get started with Android/CyanogenMod, you'll need to get
+To get started with Android/LineageOS, you'll need to get
familiar with [Repo](https://source.android.com/source/using-repo.html) and [Version Control with Git](https://source.android.com/source/version-control.html).
-To initialize your local repository using the CyanogenMod trees, use a command like this:
+To initialize your local repository using the LineageOS trees, use a command like this:
- repo init -u git://github.com/CyanogenMod/android.git -b cm-13.0
+ repo init -u git://github.com/LineageOS/android.git -b cm-13.0
Then to sync up:
repo sync
-Please see the [CyanogenMod Wiki](http://wiki.cyanogenmod.org/) for building instructions, by device.
+Please see the [LineageOS Wiki](http://wiki.lineageos.org/) for building instructions, by device.
For more information on this Github Organization and how it is structured,
-please [read the wiki article](http://wiki.cyanogenmod.org/w/Github_Organization)
+please [read the wiki article](http://wiki.lineageos.org/w/Github_Organization)
Buildbot
--------
All supported devices are built nightly and periodically as changes are committed to ensure the source trees remain buildable.
-You can view the current build statuses in the [Jenkins](http://jenkins.cyanogenmod.org) tool.
+You can view the current build statuses in the [Jenkins](http://jenkins.lineageos.org) tool.
diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk
new file mode 100644
index 00000000..77547e31
--- /dev/null
+++ b/bootanimation/Android.mk
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define build-bootanimation
+ sh vendor/cm/bootanimation/generate-bootanimation.sh \
+ $(TARGET_SCREEN_WIDTH) \
+ $(TARGET_SCREEN_HEIGHT) \
+ $(TARGET_BOOTANIMATION_HALF_RES)
+endef
+
+TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip
+$(TARGET_GENERATED_BOOTANIMATION):
+ @echo "Building bootanimation"
+ $(build-bootanimation)
+
+ifeq ($(TARGET_BOOTANIMATION),)
+ TARGET_BOOTANIMATION := $(TARGET_GENERATED_BOOTANIMATION)
+ ifeq ($(shell command -v mogrify),)
+ $(info **********************************************)
+ $(info The boot animation could not be generated as)
+ $(info ImageMagick is not installed in your system.)
+ $(info $(space))
+ $(info Please install ImageMagick from this website:)
+ $(info https://imagemagick.org/script/binary-releases.php)
+ $(info **********************************************)
+ $(error stop)
+ endif
+endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := bootanimation.zip
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT)/media
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(TARGET_BOOTANIMATION)
+ @mkdir -p $(dir $@)
+ @cp $(TARGET_BOOTANIMATION) $@
diff --git a/bootanimation/CleanSpec.mk b/bootanimation/CleanSpec.mk
new file mode 100644
index 00000000..a32a8837
--- /dev/null
+++ b/bootanimation/CleanSpec.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/BOOTANIMATION)
diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar
new file mode 100644
index 00000000..7e4b0dc9
Binary files /dev/null and b/bootanimation/bootanimation.tar differ
diff --git a/bootanimation/desc.txt b/bootanimation/desc.txt
new file mode 100644
index 00000000..5ddacd6b
--- /dev/null
+++ b/bootanimation/desc.txt
@@ -0,0 +1,5 @@
+c 1 0 part0
+c 0 0 part1
+c 1 0 part2
+c 1 1 part3
+c 1 0 part4
diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
new file mode 100755
index 00000000..cab7be8d
--- /dev/null
+++ b/bootanimation/generate-bootanimation.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+WIDTH="$1"
+HEIGHT="$2"
+HALF_RES="$3"
+OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION"
+
+if [ "$HEIGHT" -lt "$WIDTH" ]; then
+ IMAGEWIDTH="$HEIGHT"
+else
+ IMAGEWIDTH="$WIDTH"
+fi
+
+IMAGESCALEWIDTH="$IMAGEWIDTH"
+IMAGESCALEHEIGHT=$(expr $IMAGESCALEWIDTH / 3)
+
+if [ "$HALF_RES" = "true" ]; then
+ IMAGEWIDTH=$(expr $IMAGEWIDTH / 2)
+fi
+
+IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3)
+
+RESOLUTION=""$IMAGEWIDTH"x"$IMAGEHEIGHT""
+
+for part_cnt in 0 1 2 3 4
+do
+ mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
+done
+tar xfp "vendor/cm/bootanimation/bootanimation.tar" -C "$OUT/bootanimation/"
+mogrify -resize $RESOLUTION -colors 250 "$OUT/bootanimation/"*"/"*".png"
+
+# Create desc.txt
+echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 60 > "$OUT/bootanimation/desc.txt"
+cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt"
+
+# Create bootanimation.zip
+cd "$OUT/bootanimation"
+
+zip -qr0 "$OUT/bootanimation.zip" .
diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt
index 05a0341e..6881b3f9 100644
--- a/build/core/apicheck_msg_current.txt
+++ b/build/core/apicheck_msg_current.txt
@@ -4,7 +4,7 @@ You have tried to change the API from what has been previously approved.
STOP.
Read this:
- https://github.com/CyanogenMod/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
+ https://github.com/LineageOS/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
To make these errors go away, you have two choices:
1) You can add "@hide" javadoc comments to the methods, etc. listed in the
@@ -142,6 +142,6 @@ To make these errors go away, you have two choices:
,;+++++++++++++++++++++++++++++++++++++++++++++++++++++++:.
..,;;+++++++++++++++++++++++++++++;:,.
- To submit the revised current.txt to the main CyanogenMod repository,
+ To submit the revised current.txt to the main LineageOS repository,
you will need approval.
******************************
diff --git a/build/core/config.mk b/build/core/config.mk
index 75bfca7a..62a403aa 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -1,4 +1,5 @@
# Copyright (C) 2015 The CyanogenMod Project
+# (C) 2017 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -26,3 +27,5 @@ FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/replicant/build/core/apich
BUILD_MAVEN_PREBUILT := $(TOP)/vendor/replicant/build/core/maven_artifact.mk
PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/replicant/build/core/maven_artifact_publish.mk
+
+BUILD_HTTP_PREBUILT := $(TOP)/vendor/replicant/build/core/http_prebuilt.mk
diff --git a/build/core/http_prebuilt.mk b/build/core/http_prebuilt.mk
new file mode 100644
index 00000000..4d7556a6
--- /dev/null
+++ b/build/core/http_prebuilt.mk
@@ -0,0 +1,89 @@
+# Copyright (C) 2015 The CyanogenMod Project
+# (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ifeq ($(strip $(LOCAL_HTTP_PATH)),)
+ $(error LOCAL_HTTP_PATH not defined.)
+endif
+
+ifeq ($(strip $(LOCAL_HTTP_FILENAME)),)
+ $(error LOCAL_HTTP_FILENAME not defined.)
+endif
+
+ifeq ($(strip $(LOCAL_HTTP_MD5SUM)),)
+ $(error LOCAL_HTTP_MD5SUM not defined.)
+endif
+
+PREBUILT_MODULE_ARCHIVE := vendor/cm/prebuilt/archive/$(LOCAL_MODULE)
+
+PREBUILT_MODULE_FILE := $(PREBUILT_MODULE_ARCHIVE)/$(LOCAL_HTTP_FILENAME)
+
+PREBUILT_MODULE_MD5SUM := $(PREBUILT_MODULE_ARCHIVE)/md5sum
+
+HTTP_FILE_URL := $(LOCAL_HTTP_PATH)/$(LOCAL_HTTP_FILENAME)
+HTTP_FILE_MD5_URL := $(LOCAL_HTTP_PATH)/$(LOCAL_HTTP_MD5SUM)
+
+LOCAL_PREBUILT_MODULE_FILE := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE),,COMMON)/$(LOCAL_HTTP_FILENAME)
+
+$(LOCAL_PREBUILT_MODULE_FILE): filename := $(LOCAL_HTTP_FILENAME)
+$(LOCAL_PREBUILT_MODULE_FILE): checksum := $(PREBUILT_MODULE_MD5SUM)
+$(LOCAL_PREBUILT_MODULE_FILE): filepath := $(PREBUILT_MODULE_FILE)
+$(LOCAL_PREBUILT_MODULE_FILE): version := $(LOCAL_HTTP_FILE_VERSION)
+
+define curl-checksum
+ @echo "Pulling comparison md5sum for $(filename)"
+ $(call download-prebuilt-module, $(HTTP_FILE_MD5_URL),$(checksum))
+endef
+
+define audit-checksum
+ $(hide) if [ ! -f $(filepath) ]; then \
+ echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
+ $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
+ else \
+ temp_checksum=$(shell md5sum $(filepath) | cut -d ' ' -f1); \
+ if [ "$$temp_checksum" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \
+ echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
+ rm -rf $(filepath); \
+ $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
+ fi; \
+ fi; \
+ rm -f $(checksum);
+endef
+
+# $(1) url
+# $(2) file output
+define download-prebuilt-module
+ ./vendor/cm/build/tasks/http_curl_prebuilt.sh $(1) $(2);
+endef
+
+define cleanup
+ @echo "Copying: $(filename) -> $(dir $@)"
+ $(hide) mkdir -p $(dir $@)
+ $(hide) cp $(filepath) $(dir $@)/$(filename)
+endef
+
+$(LOCAL_PREBUILT_MODULE_FILE):
+ $(call curl-checksum)
+ $(call audit-checksum)
+ $(call cleanup)
+
+include $(BUILD_PREBUILT)
+
+# the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree
+fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)
+
+# the "nukeprebuilts" target will evict all archived artifacts
+nukeprebuilts:
+ @echo "Removing artifact for $(LOCAL_HTTP_FILENAME)"
+ $(hide) rm -rf $(PREBUILT_MODULE_ARCHIVE)
diff --git a/build/tasks/http_curl_prebuilt.sh b/build/tasks/http_curl_prebuilt.sh
new file mode 100755
index 00000000..c90c35f6
--- /dev/null
+++ b/build/tasks/http_curl_prebuilt.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+url=$1
+output=$2
+
+curl -L "$url" --create-dirs -o $output --compressed -H "Accept-Encoding: gzip,deflate,sdch" && exit 0 || exit 1
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 6f2ff158..fe63a124 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -429,12 +429,35 @@ function write_product_packages() {
# be executed first!
#
function write_header() {
+ if [ -f $1 ]; then
+ rm $1
+ fi
+
YEAR=$(date +"%Y")
[ "$COMMON" -eq 1 ] && local DEVICE="$DEVICE_COMMON"
- cat << EOF > $1
-# Copyright (C) $YEAR The CyanogenMod Project
+ NUM_REGEX='^[0-9]+$'
+ if [[ $INITIAL_COPYRIGHT_YEAR =~ $NUM_REGEX ]] && [ $INITIAL_COPYRIGHT_YEAR -le $YEAR ]; then
+ if [ $INITIAL_COPYRIGHT_YEAR -lt 2016 ]; then
+ printf "# Copyright (C) $INITIAL_COPYRIGHT_YEAR-2016 The CyanogenMod Project\n" > $1
+ elif [ $INITIAL_COPYRIGHT_YEAR -eq 2016 ]; then
+ printf "# Copyright (C) 2016 The CyanogenMod Project\n" > $1
+ fi
+ if [ $YEAR -eq 2017 ]; then
+ printf "# Copyright (C) 2017 The LineageOS Project\n" >> $1
+ elif [ $INITIAL_COPYRIGHT_YEAR -eq $YEAR ]; then
+ printf "# Copyright (C) $YEAR The LineageOS Project\n" >> $1
+ elif [ $INITIAL_COPYRIGHT_YEAR -le 2017 ]; then
+ printf "# Copyright (C) 2017-$YEAR The LineageOS Project\n" >> $1
+ else
+ printf "# Copyright (C) $INITIAL_COPYRIGHT_YEAR-$YEAR The LineageOS Project\n" >> $1
+ fi
+ else
+ printf "# Copyright (C) $YEAR The LineageOS Project\n" > $1
+ fi
+
+ cat << EOF >> $1
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -761,7 +784,9 @@ function extract() {
echo "Cleaning output directory ($OUTPUT_ROOT).."
rm -rf "${OUTPUT_TMP:?}"
mkdir -p "${OUTPUT_TMP:?}"
- mv "${OUTPUT_ROOT:?}/"* "${OUTPUT_TMP:?}/"
+ if [ -d "$OUTPUT_ROOT" ]; then
+ mv "${OUTPUT_ROOT:?}/"* "${OUTPUT_TMP:?}/"
+ fi
VENDOR_STATE=1
fi
diff --git a/build/tools/repopick.py b/build/tools/repopick.py
new file mode 120000
index 00000000..de58d7ee
--- /dev/null
+++ b/build/tools/repopick.py
@@ -0,0 +1 @@
+../../../../build/tools/repopick.py
\ No newline at end of file
diff --git a/config/common.mk b/config/common.mk
index cace12aa..b16e7a5a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -44,13 +44,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
endif
PRODUCT_PROPERTY_OVERRIDES += \
- keyguard.no_require_sim=true \
- ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
- ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
- ro.com.android.wifi-watchlist=GoogleGuest \
- ro.setupwizard.enterprise_mode=1 \
- ro.com.android.dateformat=MM-dd-yyyy \
- ro.com.android.dataroaming=false
+ keyguard.no_require_sim=true
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.selinux=1
@@ -154,7 +148,6 @@ PRODUCT_PACKAGES += \
# Custom packages
PRODUCT_PACKAGES += \
- Launcher3 \
Trebuchet \
AudioFX \
ReplicantWallpapers \
@@ -250,12 +243,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
ifneq ($(TARGET_BUILD_VARIANT),user)
PRODUCT_PACKAGES += \
procmem \
- procrank \
+ procrank
+
+# Conditionally build in su
+ifeq ($(WITH_SU),true)
+PRODUCT_PACKAGES += \
su
endif
-
-PRODUCT_PROPERTY_OVERRIDES += \
- persist.sys.root_access=0
+endif
DEVICE_PACKAGE_OVERLAYS += vendor/replicant/overlay/common
diff --git a/config/common_full_tv.mk b/config/common_full_tv.mk
index 779b918c..10b2a5cf 100644
--- a/config/common_full_tv.mk
+++ b/config/common_full_tv.mk
@@ -1,7 +1,2 @@
# Inherit common CM stuff
$(call inherit-product, vendor/cm/config/common_full.mk)
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
- PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk
index 63f2bcf3..86f1a6b8 100644
--- a/config/common_mini_tv.mk
+++ b/config/common_mini_tv.mk
@@ -1,7 +1,2 @@
# Inherit common CM stuff
$(call inherit-product, vendor/cm/config/common_mini.mk)
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
- PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/gello/Android.mk b/gello/Android.mk
index 1cf0cd06..a88c42a5 100644
--- a/gello/Android.mk
+++ b/gello/Android.mk
@@ -1,5 +1,6 @@
#
# Copyright (C) 2016 The CyanogenMod Project
+# (C) 2017 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -41,11 +42,10 @@ LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MAVEN_REPO := https://maven.cyanogenmod.org/artifactory/gello_prebuilds
-LOCAL_MAVEN_GROUP := org.cyanogenmod
-LOCAL_MAVEN_VERSION := 40
-LOCAL_MAVEN_ARTIFACT := gello
-LOCAL_MAVEN_PACKAGING := apk
+LOCAL_HTTP_FILE_VERSION := 40
+LOCAL_HTTP_PATH := https://github.com/LineageOS/android_packages_apps_Gello/releases/download/$(LOCAL_HTTP_FILE_VERSION)
+LOCAL_HTTP_FILENAME := gello.apk
+LOCAL_HTTP_MD5SUM := $(LOCAL_HTTP_FILENAME).md5sum
-include $(BUILD_MAVEN_PREBUILT)
+include $(BUILD_HTTP_PREBUILT)
endif
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 403890ed..cdbfec2f 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -1,6 +1,7 @@
+
+ false
+
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 6ef02662..4514a531 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,6 +18,4 @@
-->
com.google.android.gms/.backup.BackupTransportService
-
- 1
diff --git a/prebuilt/common/bin/50-cm.sh b/prebuilt/common/bin/50-cm.sh
index c8b81cb9..7eac06f6 100755
--- a/prebuilt/common/bin/50-cm.sh
+++ b/prebuilt/common/bin/50-cm.sh
@@ -1,7 +1,7 @@
#!/sbin/sh
#
# /system/addon.d/50-cm.sh
-# During a CM13.0 upgrade, this script backs up /system/etc/hosts,
+# During a LineageOS 13.0 upgrade, this script backs up /system/etc/hosts,
# /system is formatted and reinstalled, then the file is restored.
#
diff --git a/prebuilt/common/bootanimation/1440.zip b/prebuilt/common/bootanimation/1440.zip
deleted file mode 100644
index d9c6dc3c..00000000
Binary files a/prebuilt/common/bootanimation/1440.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/1536.zip b/prebuilt/common/bootanimation/1536.zip
deleted file mode 100644
index a2fc1b6e..00000000
Binary files a/prebuilt/common/bootanimation/1536.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/1600.zip b/prebuilt/common/bootanimation/1600.zip
deleted file mode 100644
index f008848a..00000000
Binary files a/prebuilt/common/bootanimation/1600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1080.zip b/prebuilt/common/bootanimation/halfres/1080.zip
deleted file mode 100644
index efb45ca4..00000000
Binary files a/prebuilt/common/bootanimation/halfres/1080.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1200.zip b/prebuilt/common/bootanimation/halfres/1200.zip
deleted file mode 100644
index d63a0b09..00000000
Binary files a/prebuilt/common/bootanimation/halfres/1200.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1440.zip b/prebuilt/common/bootanimation/halfres/1440.zip
deleted file mode 100644
index eba63464..00000000
Binary files a/prebuilt/common/bootanimation/halfres/1440.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1536.zip b/prebuilt/common/bootanimation/halfres/1536.zip
deleted file mode 100644
index 3f6da277..00000000
Binary files a/prebuilt/common/bootanimation/halfres/1536.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1600.zip b/prebuilt/common/bootanimation/halfres/1600.zip
deleted file mode 100644
index 61132a97..00000000
Binary files a/prebuilt/common/bootanimation/halfres/1600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/240.zip b/prebuilt/common/bootanimation/halfres/240.zip
deleted file mode 100644
index 59735d06..00000000
Binary files a/prebuilt/common/bootanimation/halfres/240.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/320.zip b/prebuilt/common/bootanimation/halfres/320.zip
deleted file mode 100644
index 7497da0c..00000000
Binary files a/prebuilt/common/bootanimation/halfres/320.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/360.zip b/prebuilt/common/bootanimation/halfres/360.zip
deleted file mode 100644
index f1247f70..00000000
Binary files a/prebuilt/common/bootanimation/halfres/360.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/480.zip b/prebuilt/common/bootanimation/halfres/480.zip
deleted file mode 100644
index 44db576e..00000000
Binary files a/prebuilt/common/bootanimation/halfres/480.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/540.zip b/prebuilt/common/bootanimation/halfres/540.zip
deleted file mode 100644
index 35b631cf..00000000
Binary files a/prebuilt/common/bootanimation/halfres/540.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/600.zip b/prebuilt/common/bootanimation/halfres/600.zip
deleted file mode 100644
index ec352f7f..00000000
Binary files a/prebuilt/common/bootanimation/halfres/600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/720.zip b/prebuilt/common/bootanimation/halfres/720.zip
deleted file mode 100644
index cc7b7d38..00000000
Binary files a/prebuilt/common/bootanimation/halfres/720.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/768.zip b/prebuilt/common/bootanimation/halfres/768.zip
deleted file mode 100644
index f87e834f..00000000
Binary files a/prebuilt/common/bootanimation/halfres/768.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/800.zip b/prebuilt/common/bootanimation/halfres/800.zip
deleted file mode 100644
index 051db72e..00000000
Binary files a/prebuilt/common/bootanimation/halfres/800.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh b/prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh
deleted file mode 100755
index 70f6fad6..00000000
--- a/prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-HALF_RES_RESOLUTIONS="240 320 360 480 540 600 720 768 800 1080 1200 1440 1536 1600"
-
-for i in $HALF_RES_RESOLUTIONS; do
- rm -f $i.zip
- mkdir $i
- cd $i
- if [ -f ../../$(($i/2)).zip ]; then
- # use the existing scaled images
- echo "Using existing half-scale images instead of scaling from $i px"
- unzip ../../$(($i/2)).zip
- rm -f desc.txt
- unzip ../../$i.zip desc.txt
- else
- unzip ../../$i.zip
- for j in */*.[pP][nN][gG]; do
- convert $j -resize 50% tmp.png
- mv tmp.png $j
- done
- fi
- zip -r0 ../$i.zip .
- cd ..
- rm -rf $i
-done
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 4c32e431..ec1c3223 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -64,12 +64,12 @@
-
-
+
+
@@ -603,6 +603,7 @@
+
@@ -1400,6 +1401,7 @@
+
@@ -1457,7 +1459,7 @@
-
+
@@ -2999,27 +3001,16 @@
-
+
-
-
-
-
-
+
-
-
+
-
-
-
-
+
-
-
-
@@ -3374,6 +3365,7 @@
+