Merge "overlay: Enable Keyguard camera widget on tablets" into cm-11.0
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 4608f57..d13568c 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -4,7 +4,7 @@
Maintainers (CyanogenMod 11.0):
-----------------------------
* __Acer A700:__ pawitp
-* __Amazon Kindle Fire 1st Edition:__ Hashcode
+* __Amazon Kindle Fire 1st Edition:__ Hashcode, FuZZ__
* __Amazon Kindle Fire 2nd Edition:__ Hashcode
* __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens
* __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens
diff --git a/config/common.mk b/config/common.mk
index 3dc5cac..a33b9a4 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -126,8 +126,6 @@
# Optional CM packages
PRODUCT_PACKAGES += \
VoicePlus \
- VoiceDialer \
- SoundRecorder \
Basic \
libemoji
@@ -159,7 +157,6 @@
mke2fs \
tune2fs \
bash \
- vim \
nano \
htop \
powertop \
@@ -297,8 +294,8 @@
CM_DISPLAY_VERSION := $(CM_VERSION)
-ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),)
-ifneq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)
+ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),)
+ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
ifneq ($(CM_BUILDTYPE), UNOFFICIAL)
ifndef TARGET_VENDOR_RELEASE_BUILD_ID
ifneq ($(CM_EXTRAVERSION),)
diff --git a/config/common_full.mk b/config/common_full.mk
index dbc31d8..3be12a5 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -17,7 +17,9 @@
NoiseField \
PhaseBeam \
VisualizationWallpapers \
- PhotoTable
+ PhotoTable \
+ VoiceDialer \
+ SoundRecorder
PRODUCT_PACKAGES += \
VideoEditor \
@@ -26,3 +28,7 @@
libvideoeditor_osal \
libvideoeditor_videofilters \
libvideoeditorplayer
+
+# Extra tools in CM
+PRODUCT_PACKAGES += \
+ vim
diff --git a/config/telephony.mk b/config/telephony.mk
index ddb8369..1a66862 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -17,3 +17,7 @@
Stk \
CellBroadcastReceiver \
WhisperPush
+
+# Mms depends on SoundRecorder for recorded audio messages
+PRODUCT_PACKAGES += \
+ SoundRecorder
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 1ed57c1..0178249 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -267,19 +267,19 @@
<apn carrier="Manx Telecom Contract WEB" mcc="234" mnc="58" apn="web.manxpronto.net" user="gprs" password="gprs" type="default,supl" />
<apn carrier="EE Internet" mcc="234" mnc="86" apn="everywhere" user="eesecure" password="secure" authtype="1" type="default,supl,dun" />
<apn carrier="EE MMS" mcc="234" mnc="86" apn="eezone" user="eesecure" password="secure" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="mms" />
- <apn carrier="TDC Internet" mcc="238" mnc="01" apn="internet" type="default,supl" />
- <apn carrier="TDC MMS" mcc="238" mnc="01" apn="mms" mmsc="http://mmsc.tdc.dk:8002" mmsproxy="194.182.251.15" mmsport="8080" type="mms" />
- <apn carrier="TDC WAP" mcc="238" mnc="01" apn="wap" proxy="194.182.251.15" port="8080" type="default,supl" />
+ <apn carrier="TDC Internet" mcc="238" mnc="01" apn="internet" proxy="62.135.173.214" authtype="1" type="default,supl" />
+ <apn carrier="TDC MMS" mcc="238" mnc="01" apn="mms" mmsc="http://mmsc.tdc.dk:8002" mmsproxy="194.182.251.15" mmsport="8080" authtype="1" type="mms" />
+ <apn carrier="coop mobil MMS" mcc="238" mnc="01" apn="mms" mmsc="http://192.168.241.114:8002" mmsproxy="194.182.251.15" mmsport="8080" type="mms" />
<apn carrier="Telenor Internet" mcc="238" mnc="02" apn="Internet" type="default,supl" />
<apn carrier="Bibob internet DK" mcc="238" mnc="02" apn="internet.bibob.dk" port="8080" type="default,supl,mms" />
- <apn carrier="Telenor DK" mcc="238" mnc="02" apn="internet" type="default,supl" />
<apn carrier="Bibob MMS DK" mcc="238" mnc="02" apn="mms.bibob.dk" proxy="212.88.64.8" port="8080" mmsc="http://mms.telenor.dk" mmsport="8080" type="mms" />
- <apn carrier="Telenor DK MMS" mcc="238" mnc="02" apn="telenor" mmsc="http://mms.telenor.dk" mmsproxy="212.88.64.8" mmsport="8080" authenticationtype="PAP" type="mms" />
- <apn carrier="Onfone" mcc="238" mnc="02" apn="internet.sp.dk" proxy="212.088.064.008" mmsc="http://mms.telenor.dk" mmsproxy="212.088.064.008" mmsport="8080" type="default,supl,mms" />
+ <apn carrier="Telenor DK MMS" mcc="238" mnc="02" apn="telenor" mmsc="http://mms.telenor.dk" mmsproxy="212.88.64.8" mmsport="8080" authtype="1" type="mms" />
<apn carrier="3 DK" mcc="238" mnc="06" apn="data.tre.dk" mmsc="http://mms.3.dk" mmsproxy="mmsproxy.3.dk" mmsport="8799" type="default,supl,mms" />
<apn carrier="3 Danmark" mcc="238" mnc="06" apn="data.tre.dk" mmsc="http://mms.3.dk/" mmsproxy="172.16.1.25" mmsport="8799" type="default,supl,mms" />
<apn carrier="Telia DK" mcc="238" mnc="20" apn="www.internet.mtelia.dk" type="default,supl" />
<apn carrier="Telia DK MMS" mcc="238" mnc="20" apn="www.mms.mtelia.dk" mmsc="http://mms.telia.dk" mmsproxy="193.209.134.131" mmsport="8080" type="mms" />
+ <apn carrier="Call me Internet" mcc="238" mnc="20" apn="websp" authtype="2" type="default,supl" />
+ <apn carrier="Call me MMS" mcc="238" mnc="20" apn="mmssp" mmsc="http://mms.telia.dk" mmsproxy="193.209.134.131" mmsport="8080" authtype="2" type="mms" />
<apn carrier="Telenor Internet" mcc="238" mnc="77" apn="Internet" type="default,supl" />
<apn carrier="Telenor MMS" mcc="238" mnc="77" apn="telenor" mmsc="http://mms.telenor.dk" mmsproxy="212.88.64.8" mmsport="8080" type="mms" />
<apn carrier="Halebop Internet" mcc="240" mnc="01" apn="halebop.telia.se" type="default,supl" />
diff --git a/prebuilt/common/etc/selective-spn-conf.xml b/prebuilt/common/etc/selective-spn-conf.xml
index f1bd92f..ed3d276 100755
--- a/prebuilt/common/etc/selective-spn-conf.xml
+++ b/prebuilt/common/etc/selective-spn-conf.xml
@@ -1406,7 +1406,6 @@
<spnOverride numeric="24003" spn="Nordisk Mobiltelefon" />
<spnOverride numeric="24010" spn="SpringMobil" />
<spnOverride numeric="24024" spn="Sweden 2G" />
- <spnOverride numeric="24024" spn="Sweden 2G" />
<spnOverride numeric="24005" spn="Sweden 3G" />
<spnOverride numeric="24014" spn="TDC Mobil" />
<spnOverride numeric="24007" spn="Tele2Comviq" />