Merge "AicBootFix not needed with source audio Update DSP files for Inspire 4G" into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 28331d0..82c0832 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -53,6 +53,7 @@
* Droid2we (Droid2 Global): RevNumbers, x13thangelx
* V9 (ZTE Light, Optus MyTab, others): kallt_kaffe and Tom Giordano
* Motus (Backflip) : j_r0dd, flavio_frow
+* Saga (Desire S): Nexx, SuperKid
Translators:
------------
@@ -71,6 +72,8 @@
* Polish: Maciej Rozbicki
* Korean: Inseok Lee
* Traditional Chinese: Ladios Jonquil
+* Slovak: Juraj Janecek
+* Czech: Ondrej Zima
CHANGELOG
---------
diff --git a/overlay/ldpi/packages/apps/Camera/res/drawable-ldpi/bg_camera_pattern.png b/overlay/ldpi/packages/apps/Camera/res/drawable-ldpi/bg_camera_pattern.png
new file mode 100644
index 0000000..ffe6710
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Camera/res/drawable-ldpi/bg_camera_pattern.png
Binary files differ
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
new file mode 100644
index 0000000..84c41b6
--- /dev/null
+++ b/overlay/tablet/frameworks/base/core/res/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="lockscreen_carrier_default"></string>
+ <string name="power_dialog">Tabletoptionen</string>
+ <string name="reboot_system">Neu starten</string>
+ <string name="shutdown_confirm">Tablet wird heruntergefahren.</string>
+ <string name="reboot_confirm">Ihr Tablet wird neu gestartet.</string>
+ <string name="global_actions">Tabletoptionen</string>
+</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
new file mode 100644
index 0000000..f7f40be
--- /dev/null
+++ b/overlay/tablet/packages/apps/Settings/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="about_settings">Über das Tablet</string>
+</resources>
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 054b286..4ca5498 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -587,7 +587,7 @@
<apn carrier="GCI Data" mcc="311" mnc="370" apn="web.gci" type="default,supl" />
<apn carrier="GCI MMS" mcc="311" mnc="370" apn="mms.gci" mmsproxy="209.4.229.92" mmsport="9201" mmsc="http://mmsc.gci.csky.us:6672" type="mms" />
<apn carrier="Videotron" mcc="302" mnc="500" apn="media.videotron" type="default,supl" />
- <apn carrier="Videotron MMS" mcc="302" mnc="500" apn="media.videotron" mmsc="http://media.videotron.com/" m msproxy="10.208.89.17" mmsport="8080" type="mms" />
+ <apn carrier="Videotron MMS" mcc="302" mnc="500" apn="media.videotron" mmsc="http://media.videotron.com/" mmsproxy="10.208.89.17" mmsport="8080" type="mms" />
<apn carrier="Claro PR" mcc="330" mnc="11" apn="internet.claropr.com" port="8080" type="default,supl" />
<apn carrier="Claro PR MMS" mcc="330" mnc="11" apn="mms.claropr.com" mmsc="http://mmsg.claropr.com:1021/mmsc" mmsproxy="10.50.38.3" mmsport="8799" type="mms" />
<apn carrier="Telcel EDGE" mcc="334" mnc="020" apn="internet.itelcel.com" user="webgprs" password="webgprs2002" type="default,supl" />
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 267121d..8416562 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -36,6 +36,7 @@
$(LOCAL_DIR)/cyanogen_p990.mk \
$(LOCAL_DIR)/cyanogen_p999.mk \
$(LOCAL_DIR)/cyanogen_passion.mk \
+ $(LOCAL_DIR)/cyanogen_saga.mk \
$(LOCAL_DIR)/cyanogen_shadow.mk \
$(LOCAL_DIR)/cyanogen_sholes.mk \
$(LOCAL_DIR)/cyanogen_showcasemtd.mk \
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
index 47dae3d..65e844c 100644
--- a/products/cyanogen_anzu.mk
+++ b/products/cyanogen_anzu.mk
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/anzu
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/products/cyanogen_fascinatemtd.mk b/products/cyanogen_fascinatemtd.mk
index 216fc5a..8a6a8a2 100644
--- a/products/cyanogen_fascinatemtd.mk
+++ b/products/cyanogen_fascinatemtd.mk
@@ -17,6 +17,9 @@
# Extra fascinatemtd overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/fascinatemtd
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
#
# Set ro.modversion
#
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index 8a67fbb..817ab07 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/hallon
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/products/cyanogen_mesmerizemtd.mk b/products/cyanogen_mesmerizemtd.mk
index 754af54..90d24e5 100644
--- a/products/cyanogen_mesmerizemtd.mk
+++ b/products/cyanogen_mesmerizemtd.mk
@@ -17,6 +17,9 @@
# Extra mesmerizemtd overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mesmerizemtd
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
#
# Set ro.modversion
#
diff --git a/products/cyanogen_saga.mk b/products/cyanogen_saga.mk
new file mode 100644
index 0000000..79391ab
--- /dev/null
+++ b/products/cyanogen_saga.mk
@@ -0,0 +1,57 @@
+# Inherit device configuration for saga.
+$(call inherit-product, device/htc/saga/saga.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_saga
+PRODUCT_BRAND := htc_europe
+PRODUCT_DEVICE := saga
+PRODUCT_MODEL := HTC Desire S
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_saga BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=htc_europe/htc_saga/saga:2.3.3/GRI40/78999:user/release-keys PRIVATE_BUILD_DESC="1.47.401.4 CL78999 release-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_saga_defconfig
+
+# Extra saga overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/saga
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Add AicBootFix for saga battery fix
+PRODUCT_PACKAGES += AicBootFix
+
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DesireS
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-DesireS
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-DesireS-KANG
+ endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_showcasemtd.mk b/products/cyanogen_showcasemtd.mk
index 0e7e7f5..2968ceb 100644
--- a/products/cyanogen_showcasemtd.mk
+++ b/products/cyanogen_showcasemtd.mk
@@ -17,6 +17,9 @@
# Extra showcasemtd overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/showcasemtd
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
#
# Set ro.modversion
#
diff --git a/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk
index 4b95fd4..f6c6e09 100644
--- a/products/cyanogen_zeus.mk
+++ b/products/cyanogen_zeus.mk
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeus
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 95fd2cd..c9bf75c 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -35,6 +35,7 @@
add_lunch_combo cyanogen_p990-eng
add_lunch_combo cyanogen_p999-eng
add_lunch_combo cyanogen_passion-eng
+add_lunch_combo cyanogen_saga-eng
add_lunch_combo cyanogen_shadow-eng
add_lunch_combo cyanogen_sholes-eng
add_lunch_combo cyanogen_showcasemtd-eng
