Browse Source

Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
replicant-6.0
Wolfgang Wiedmeyer 3 years ago
parent
commit
64dba5e9e2
No known key found for this signature in database GPG Key ID: 5816A24C10757FC4
43 changed files with 308 additions and 95 deletions
  1. +1
    -0
      .gitignore
  2. +3
    -3
      CHANGELOG.mkdn
  3. +4
    -3
      CONTRIBUTORS.mkdn
  4. +1
    -0
      LICENSE
  5. +9
    -9
      README.mkdn
  6. +53
    -0
      bootanimation/Android.mk
  7. +17
    -0
      bootanimation/CleanSpec.mk
  8. BIN
      bootanimation/bootanimation.tar
  9. +5
    -0
      bootanimation/desc.txt
  10. +39
    -0
      bootanimation/generate-bootanimation.sh
  11. +2
    -2
      build/core/apicheck_msg_current.txt
  12. +3
    -0
      build/core/config.mk
  13. +89
    -0
      build/core/http_prebuilt.mk
  14. +6
    -0
      build/tasks/http_curl_prebuilt.sh
  15. +28
    -3
      build/tools/extract_utils.sh
  16. +1
    -0
      build/tools/repopick.py
  17. +7
    -12
      config/common.mk
  18. +0
    -5
      config/common_full_tv.mk
  19. +0
    -5
      config/common_mini_tv.mk
  20. +6
    -6
      gello/Android.mk
  21. +2
    -1
      overlay/common/frameworks/base/core/res/res/values/config.xml
  22. +21
    -0
      overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
  23. +0
    -2
      overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
  24. +1
    -1
      prebuilt/common/bin/50-cm.sh
  25. BIN
      prebuilt/common/bootanimation/1440.zip
  26. BIN
      prebuilt/common/bootanimation/1536.zip
  27. BIN
      prebuilt/common/bootanimation/1600.zip
  28. BIN
      prebuilt/common/bootanimation/halfres/1080.zip
  29. BIN
      prebuilt/common/bootanimation/halfres/1200.zip
  30. BIN
      prebuilt/common/bootanimation/halfres/1440.zip
  31. BIN
      prebuilt/common/bootanimation/halfres/1536.zip
  32. BIN
      prebuilt/common/bootanimation/halfres/1600.zip
  33. BIN
      prebuilt/common/bootanimation/halfres/240.zip
  34. BIN
      prebuilt/common/bootanimation/halfres/320.zip
  35. BIN
      prebuilt/common/bootanimation/halfres/360.zip
  36. BIN
      prebuilt/common/bootanimation/halfres/480.zip
  37. BIN
      prebuilt/common/bootanimation/halfres/540.zip
  38. BIN
      prebuilt/common/bootanimation/halfres/600.zip
  39. BIN
      prebuilt/common/bootanimation/halfres/720.zip
  40. BIN
      prebuilt/common/bootanimation/halfres/768.zip
  41. BIN
      prebuilt/common/bootanimation/halfres/800.zip
  42. +0
    -25
      prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh
  43. +10
    -18
      prebuilt/common/etc/apns-conf.xml

+ 1
- 0
.gitignore View File

@@ -1,3 +1,4 @@
proprietary/*
prebuilt/common/apps/
prebuilt/archive
*~

+ 3
- 3
CHANGELOG.mkdn View File

@@ -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)
---------


+ 4
- 3
CONTRIBUTORS.mkdn View File

@@ -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


+ 1
- 0
LICENSE View File

@@ -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.


+ 9
- 9
README.mkdn View File

@@ -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.

+ 53
- 0
bootanimation/Android.mk View File

@@ -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) $@

+ 17
- 0
bootanimation/CleanSpec.mk View File

@@ -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)

BIN
bootanimation/bootanimation.tar View File


+ 5
- 0
bootanimation/desc.txt View File

@@ -0,0 +1,5 @@
c 1 0 part0
c 0 0 part1
c 1 0 part2
c 1 1 part3
c 1 0 part4

+ 39
- 0
bootanimation/generate-bootanimation.sh View File

@@ -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" .

+ 2
- 2
build/core/apicheck_msg_current.txt View File

@@ -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.
******************************

+ 3
- 0
build/core/config.mk View File

@@ -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

+ 89
- 0
build/core/http_prebuilt.mk View File

@@ -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)

+ 6
- 0
build/tasks/http_curl_prebuilt.sh View File

@@ -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

+ 28
- 3
build/tools/extract_utils.sh View File

@@ -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



+ 1
- 0
build/tools/repopick.py View File

@@ -0,0 +1 @@
../../../../build/tools/repopick.py

+ 7
- 12
config/common.mk View File

@@ -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



+ 0
- 5
config/common_full_tv.mk View File

@@ -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

+ 0
- 5
config/common_mini_tv.mk View File

@@ -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

+ 6
- 6
gello/Android.mk View File

@@ -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

+ 2
- 1
overlay/common/frameworks/base/core/res/res/values/config.xml View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 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,7 +42,7 @@
<item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
</string-array>

<string name="config_mms_user_agent">CyanogenMod</string>
<string name="config_mms_user_agent">LineageOS</string>
<string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>

<!-- Defines the default set of global actions. Actions may still be disabled or hidden based


+ 21
- 0
overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source 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.
*/
-->
<resources>
<bool name="def_enable_mobile_data">false</bool>
</resources>

+ 0
- 2
overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml View File

@@ -18,6 +18,4 @@
-->
<resources>
<string name="def_backup_transport">com.google.android.gms/.backup.BackupTransportService</string>
<!-- Enable notification counters in statusbar -->
<integer name="def_notif_count">1</integer>
</resources>

+ 1
- 1
prebuilt/common/bin/50-cm.sh View File

@@ -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.
#



BIN
prebuilt/common/bootanimation/1440.zip View File


BIN
prebuilt/common/bootanimation/1536.zip View File


BIN
prebuilt/common/bootanimation/1600.zip View File


BIN
prebuilt/common/bootanimation/halfres/1080.zip View File


BIN
prebuilt/common/bootanimation/halfres/1200.zip View File


BIN
prebuilt/common/bootanimation/halfres/1440.zip View File


BIN
prebuilt/common/bootanimation/halfres/1536.zip View File


BIN
prebuilt/common/bootanimation/halfres/1600.zip View File


BIN
prebuilt/common/bootanimation/halfres/240.zip View File


BIN
prebuilt/common/bootanimation/halfres/320.zip View File


BIN
prebuilt/common/bootanimation/halfres/360.zip View File


BIN
prebuilt/common/bootanimation/halfres/480.zip View File


BIN
prebuilt/common/bootanimation/halfres/540.zip View File


BIN
prebuilt/common/bootanimation/halfres/600.zip View File


BIN
prebuilt/common/bootanimation/halfres/720.zip View File


BIN
prebuilt/common/bootanimation/halfres/768.zip View File


BIN
prebuilt/common/bootanimation/halfres/800.zip View File


+ 0
- 25
prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh View File

@@ -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

+ 10
- 18
prebuilt/common/etc/apns-conf.xml View File

@@ -64,12 +64,12 @@
<apn carrier="EHRPD - VZW Roaming IMS" mcc="204" mnc="04" apn="VZWIMS" type="ims,ia" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer_bitmask="13" mvno_type="gid" mvno_match_data="BAE0000000000000" profile_id="2" modem_cognitive="true" max_conns="1023" max_conns_time="300" />
<apn carrier="LTE - VZW Roaming CBS" mcc="204" mnc="04" apn="VZWAPP" type="cbs,mms" mmsc="http://mms.vzwreseller.com/servlets/mms" protocol="IPV4V6" roaming_protocol="IPV4V6" mvno_type="gid" mvno_match_data="BAE0000000000000" profile_id="4" modem_cognitive="true" max_conns="1023" max_conns_time="300" />
<apn carrier="EHRPD - VZW Roaming CBS" mcc="204" mnc="04" apn="VZWAPP" type="cbs,mms" mmsc="http://mms.vzwreseller.com/servlets/mms" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer_bitmask="13" mvno_type="gid" mvno_match_data="BAE0000000000000" profile_id="4" modem_cognitive="true" max_conns="1023" max_conns_time="300" />
<apn carrier="hollandsnieuwe int." mcc="204" mnc="04" apn="data.dataxs.mobi" type="default,supl" />
<apn carrier="Vodafone MMS Business" mcc="204" mnc="04" apn="office.vodafone.nl" user="vodafone" password="vodafone" mmsc="http://mmsc.mms.vodafone.nl" mmsproxy="192.168.251.150" mmsport="8799" type="mms" />
<apn carrier="中国电信NET设置" mcc="204" mnc="04" apn="ctnet" user="ctnet@mycdma.cn" password="vnet.mobi" authtype="3" type="default,supl,dun" />
<apn carrier="中国电信WAP设置" mcc="204" mnc="04" apn="ctwap" user="ctwap@mycdma.cn" password="vnet.mobi" proxy="10.0.0.200" port="80" mmsproxy="10.0.0.200" mmsport="80" mmsc="http://mmsc.vnet.mobi" authtype="3" type="default,supl,dun,mms" />
<apn carrier="Ziggo Mobiel" mcc="204" mnc="04" apn="ziggo.dataxs.mobi" authtype="1" type="default,supl" />
<apn carrier="Hollandsnieuwe" mcc="204" mnc="04" apn="data.dataxs.mobi" proxy="" port="" user="" password="" mmsc="" authtype="1" type="default,supl" />
<apn carrier="hollandsnieuwe (type 1)" mcc="204" mnc="04" apn="data.dataxs.mobi" proxy="" port="" user="hollandsnieuwe" password="hollandsnieuwe" mmsc="" authtype="1" type="default,supl" />
<apn carrier="hollandsnieuwe (type 2)" mcc="204" mnc="04" apn="live.vodafone.com" user="vodafone" password="vodafone" authtype="1" type="default,supl" />
<apn carrier="Truphone" mcc="204" mnc="04" apn="truphone.com" type="default,dun" mvno_match_data="204043914" mvno_type="imsi" />
<apn carrier="Truphone" mcc="204" mnc="04" apn="truphone.com" type="default,dun" mvno_match_data="20404794" mvno_type="imsi" />
<apn carrier="KPN 4G LTE" mcc="204" mnc="08" apn="KPN4G.nl" mmsc="http://mp.mobiel.kpn/mmsc" mmsproxy="10.10.100.20" mmsport="5080" type="default,supl,mms" />
@@ -603,6 +603,7 @@
<apn carrier="3 Modem" mcc="234" mnc="20" apn="3internet" type="default,supl" />
<apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
<apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
<apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
<apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
<apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
<apn carrier="Truphone UK" mcc="234" mnc="25" apn="truphone.com" type="default,supl" />
@@ -1400,6 +1401,7 @@
<apn carrier="ATT Broadband" mcc="310" mnc="170" apn="Broadband" type="default,supl" />
<apn carrier="DataConnect" mcc="310" mnc="170" apn="isp.cingular" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
<apn carrier="Cingular MMS" mcc="310" mnc="170" apn="wap.cingular" proxy="" port="" user="WAP@CINGULARGPRS.COM" password="CINGULAR1" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.32" mmsport="8080" type="mms" />
<apn carrier="FreedomPop" mcc="310" mnc="170" apn="fp.com.attz" type="" />
<apn carrier="ATT WAP" mcc="310" mnc="180" apn="wap.cingular" proxy="wireless.cingular.com" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,mms" />
<apn carrier="ATT Broadband" mcc="310" mnc="180" apn="Broadband" type="default,supl" />
<apn carrier="WCW Internet" mcc="310" mnc="180" apn="internet.wcc.net" user="3257630000" password="mmsc" type="default,supl" authtype="0" />
@@ -1457,7 +1459,7 @@
<apn carrier="Straight Talk" mcc="310" mnc="410" apn="tfdata" port="80" mmsc="http://mms-tf.net" mmsproxy="mms3.tracfone.com" mmsport="80" mvno_type="gid" mvno_match_data="deff" type="default,mms,supl" />
<apn carrier="Red Pocket" mcc="310" mnc="410" apn="PRODATA" port="" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" mvno_type="gid" mvno_match_data="4201" type="default,mms,supl" />
<apn carrier="Black Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl,agps,fota" authtype="1" />
<apn carrier="H20 Wireless" mcc="310" mnc="410" apn="prodata" proxy="" port="" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,mms,supl" />
<apn carrier="H2O Wireless" mcc="310" mnc="410" apn="PRODATA" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,mms,supl" />
<apn carrier="Pure Talk USA" mcc="310" mnc="410" apn="att.mvno" proxy="" port="" mmsc="http://mmsc.cingular.com" mmsproxy="proxy.mvno.telrite.com" mmsport="80" type="default,mms,supl" />
<apn carrier="AirVoice Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl" />
<apn carrier="Jolt Mobile" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl" />
@@ -2999,27 +3001,16 @@
<apn carrier="SKT 3G INTERNET" mcc="450" mnc="11" apn="web.sktelecom.com" type="default,mms,supl,fota,cbs" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" server="*" />
<apn carrier="SKT LTE Roaming" mcc="450" mnc="11" apn="lte-roaming.sktelecom.com" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" server="*" />
<apn carrier="SKT 3G Roaming" mcc="450" mnc="11" apn="roaming.sktelecom.com" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" server="*" />
<apn carrier="Mobifone GPRS" mcc="452" mnc="01" apn="m-wap" user="mms" password="mms" authtype="1" type="default,supl" />
<apn carrier="Mobifone 3G" mcc="452" mnc="01" apn="m-wap" user="mms" password="mms" authtype="1" type="default,supl" />
<apn carrier="Mobifone MMS" mcc="452" mnc="01" apn="m-i090" proxy="" port="" mmsproxy="203.162.21.114" mmsport="8080" mmsc="http://203.162.21.114/mmsc" user="mms" password="mms" authtype="1" type="mms" />
<apn carrier="Vinaphone GPRS" mcc="452" mnc="02" apn="v-internet" type="default,supl" />
<apn carrier="Vinaphone MMS" mcc="452" mnc="02" apn="m3-mms" proxy="" port="" mmsproxy="10.1.10.46" mmsport="8000" mmsc="http://mms.vinaphone.com.vn" type="mms" />
<apn carrier="Vinaphone MMS" mcc="452" mnc="02" apn="m3-mms" user="mms" password="mms" mmsc="http://mms.vinaphone.vnn.vn:8002" mmsproxy="10.1.10.46" mmsport="9201" type="mms" />
<apn carrier="Vinaphone" mcc="452" mnc="02" apn="m3-world" user="mms" password="mms" type="default,supl" />
<apn carrier="Viettel WAP" mcc="452" mnc="04" apn="v-wap" proxy="192.168.233.10" port="8080" mmsc="" user="" password="" type="default,supl" />
<apn carrier="Viettel MMS" mcc="452" mnc="04" apn="v-mms" proxy="" port="" mmsproxy="192.168.233.10" mmsport="8080" mmsc="http://mms.viettelmobile.com.vn/mms/wapenc" user="" password="" type="mms" />
<apn carrier="Vinaphone 3G" mcc="452" mnc="02" apn="m3-world" user="mms" password="mms" type="default,supl" />
<apn carrier="Viettel 3G" mcc="452" mnc="04" apn="v-internet" type="default,supl" />
<apn carrier="Viettel" mcc="452" mnc="04" apn="v-internet" type="default,supl" />
<apn carrier="Viettel MMS" mcc="452" mnc="04" apn="v-mms" mmsc="http://mms.viettelmobile.com.vn/mms" mmsproxy="192.168.233.10" mmsport="9201" type="mms" />
<apn carrier="Vietnamobile GPRS" mcc="452" mnc="05" apn="internet" type="default,supl" />
<apn carrier="Vietnamobile 3G" mcc="452" mnc="05" apn="internet" type="default,supl" />
<apn carrier="Vietnamobile MMS" mcc="452" mnc="05" apn="mms" proxy="" port="" mmsproxy="10.10.128.44" mmsport="8080" mmsc="http://10.10.128.58/servlets/mms" type="mms" />
<apn carrier="VIETNAMOBILE" mcc="452" mnc="05" apn="wap" proxy="10.10.128.44" port="8080" type="default,supl" />
<apn carrier="Beeline GPRS" mcc="452" mnc="07" apn="internet" type="default,supl" />
<apn carrier="Beeline MMS" mcc="452" mnc="07" apn="mms" proxy="" port="" mmsproxy="10.16.70.199" mmsport="8080" mmsc="http://mms" user="mms" password="mms" authtype="1" type="mms" />
<apn carrier="BeeLine VN" mcc="452" mnc="07" apn="internet" type="default,supl" />
<apn carrier="BeeLine VN 3G" mcc="452" mnc="07" apn="internet" type="default,supl" />
<apn carrier="Beeline VN MMS" mcc="452" mnc="07" apn="MMS" user="mms" password="mms" mmsc="http://mms" mmsproxy="10.16.70.199" mmsport="8080" type="mms" />
<apn carrier="VIETNAMOBILE MMS" mcc="452" mnc="05" apn="mms" proxy="" port="" user="" password="" mmsc="http://10.10.128.58/servlets/mms" mmsproxy="10.10.128.44" mmsport="8080" type="mms" />
<apn carrier="VIETNAMOBILE" mcc="452" mnc="05" apn="wap" proxy="10.10.128.44" port="8080" user="" password="" mmsc="" type="default,supl" />
<apn carrier="Beeline VN MMS" mcc="452" mnc="07" apn="MMS" proxy="" port="" user="mms" password="mms" mmsc="http://mms" mmsproxy="10.16.70.199" mmsport="8080" type="mms" />
<apn carrier="csl" mcc="454" mnc="00" apn="mobile" mmsc="http://192.168.58.171:8002" mmsproxy="192.168.59.51" mmsport="8080" type="default,mms,hipri" authtype="3" mvno_match_data="01020000" mvno_type="gid" />
<apn carrier="csl Tethering" mcc="454" mnc="00" apn="lte.internet" type="dun" mvno_match_data="01020000" mvno_type="gid" />
<apn carrier="csl" mcc="454" mnc="00" apn="mobile" mmsc="http://192.168.58.171:8002" mmsproxy="192.168.59.51" mmsport="8080" authtype="3" type="default,mms,hipri" />
@@ -3374,6 +3365,7 @@
<apn carrier="True" mcc="520" mnc="99" apn="internet" user="true" password="true" type="default,supl" />
<apn carrier="True MMS" mcc="520" mnc="99" apn="mms" user="true" password="true" mmsc="http://mms.trueworld.net:8002" mmsproxy="10.4.7.39" mmsport="8080" type="mms" />
<apn carrier="SingTel" mcc="525" mnc="01" apn="e-ideas" type="default,supl" />
<apn carrier="SingTel hi!card" mcc="525" mnc="01" apn="hicard" mmsc="http://mms.singtel.com:10021/mmsc" mmsproxy="165.21.42.84" mmsport="8080" authtype="1" type="default,supl,mms" />
<apn carrier="IDEAS" mcc="525" mnc="01" apn="e-ideas" type="default,supl,mms" />
<apn carrier="IDEAS MMS" mcc="525" mnc="01" apn="e-ideas" user="65IDEAS" password="65ideas" mmsc="http://mms.singtel.com:10021/mmsc" mmsproxy="165.21.42.84" mmsport="8080" type="mms" />
<apn carrier="SingTel" mcc="525" mnc="02" apn="e-ideas" type="default,supl" />


Loading…
Cancel
Save